From 9bf608f00e4937d1e717749804d94b7b90aa7e06 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Tue, 28 Jun 2016 18:29:06 +0000 Subject: [PATCH] gettext: fix incorrect sed for libasprintf.la on x86 2nd arch. (#669) The search pattern used in the sed call to fix libasprintf.la did match and work fine on primary architectures, but failed on x86 secondary, resulting in a package that would become invalid if gcc_x86 got upgraded later. The correct search pattern to match e.g. develop/tools/x86/lib/gcc/ is not develop/tools/$relativeLibDir/gcc/ but develop/tools$secondaryArchSubDir/lib/gcc/ and works for all architectures, including secondary, of course. --- sys-devel/gettext/gettext-0.19.8.1.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-devel/gettext/gettext-0.19.8.1.recipe b/sys-devel/gettext/gettext-0.19.8.1.recipe index e2e099d91..eea03de9d 100644 --- a/sys-devel/gettext/gettext-0.19.8.1.recipe +++ b/sys-devel/gettext/gettext-0.19.8.1.recipe @@ -16,7 +16,7 @@ preparing these sets, or bringing them up to date. HOMEPAGE="https://www.gnu.org/software/gettext/" COPYRIGHT="1998-2016 Free Software Foundation, Inc." LICENSE="GNU GPL v3" -REVISION="1" +REVISION="2" SOURCE_URI="http://ftpmirror.gnu.org/gettext/gettext-$portVersion.tar.gz" CHECKSUM_SHA256="ff942af0e438ced4a8b0ea4b0b6e0d6d657157c5e2364de57baa279c1c125c43" PATCHES="gettext-$portVersion.patchset" @@ -135,7 +135,7 @@ INSTALL() if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then local libstdcpp="$portPackageLinksDir/gcc$secondaryArchSuffix" sed -i \ - -e "s,/packages/gcc$secondaryArchSuffix-[^\ /]*/\.self/\(develop/tools/$relativeLibDir/gcc/$effectiveTargetMachineTriple/[^\ /]*/libstdc++.la\),$libstdcpp/\1," \ + -e "s,/packages/gcc$secondaryArchSuffix-[^\ /]*/\.self/\(develop/tools$secondaryArchSubDir/lib/gcc/$effectiveTargetMachineTriple/[^\ /]*/libstdc++.la\),$libstdcpp/\1," \ $developLibDir/libasprintf.la fi