diff --git a/app-misc/pax-utils/pax_utils-1.2.6.recipe b/app-misc/pax-utils/pax_utils-1.2.6.recipe index 1b2adf41c..d4dcf5d88 100644 --- a/app-misc/pax-utils/pax_utils-1.2.6.recipe +++ b/app-misc/pax-utils/pax_utils-1.2.6.recipe @@ -9,21 +9,28 @@ COPYRIGHT=" 2004-2016 Mike Frysinger " LICENSE="GNU GPL v2" -REVISION="1" +REVISION="2" SOURCE_URI="https://dev.gentoo.org/~slyfox/distfiles/pax-utils-$portVersion.tar.xz" CHECKSUM_SHA256="9742d2a31d53a4e0f6df0d3721ab6f7cf8b0404c95fee3b00e678c1ff6db7f21" SOURCE_DIR="pax-utils-$portVersion" PATCHES="pax_utils-$portVersion.patchset" -ARCHITECTURES="?x86_gcc2 ?x86 x86_64" +ARCHITECTURES="!x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86" + +commandSuffix=$secondaryArchSuffix +commandBinDir=$binDir +if [ "$targetArchitecture" = x86_gcc2 ]; then + commandSuffix= + commandBinDir=$prefix/bin +fi PROVIDES=" - pax_utils = $portVersion - cmd:dumpelf = $portVersion - cmd:lddtree = $portVersion - cmd:pspax = $portVersion - cmd:scanelf = $portVersion - cmd:scanmacho = $portVersion - cmd:symtree = $portVersion + pax_utils$secondaryArchSuffix = $portVersion + cmd:dumpelf$commandSuffix = $portVersion + cmd:lddtree$commandSuffix = $portVersion + cmd:scanelf$commandSuffix = $portVersion + cmd:scanmacho$commandSuffix = $portVersion + cmd:symtree$commandSuffix = $portVersion " REQUIRES=" @@ -35,11 +42,13 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" + cmd:ar$secondaryArchSuffix cmd:awk cmd:cmp cmd:dd cmd:make - cmd:gcc + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:grep cmd:egrep cmd:sed @@ -47,13 +56,16 @@ BUILD_PREREQUIRES=" BUILD() { - runConfigure ./configure + runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir make $jobArgs } INSTALL() { make install + # pspax hasn't been ported yet + rm -f $commandBinDir/pspax$commandSuffix + rm -f $manDir/man1/pspax.1 } TEST()