From 816eb1841118ef71c44461457ac5abda5a5c2245 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Sun, 26 Oct 2014 22:10:22 +0100 Subject: [PATCH] libtool: make it work for secondaey arch * in case someone needs libltdl there. --- sys-devel/libtool/libtool-2.4.2.recipe | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/sys-devel/libtool/libtool-2.4.2.recipe b/sys-devel/libtool/libtool-2.4.2.recipe index bf9d7ecc3..859ede706 100644 --- a/sys-devel/libtool/libtool-2.4.2.recipe +++ b/sys-devel/libtool/libtool-2.4.2.recipe @@ -10,6 +10,7 @@ SRC_URI="ftp://ftp.gnu.org/gnu/libtool/libtool-2.4.2.tar.gz" CHECKSUM_SHA256="b38de44862a987293cd3d8dfae1c409d514b6c4e794ebc93648febf9afc38918" REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64 arm" +SECONDARY_ARCHITECTURES="x86" PATCHES=" 2.4.2/adjust_config_for_packaging.patch @@ -17,14 +18,14 @@ PATCHES=" " PROVIDES=" - libtool = $portVersion compat >= 2.4 - cmd:libtool = $portVersion compat >= 2.4 - cmd:libtoolize = $portVersion compat >= 2.4 - devel:libltdl = 7.3.0 compat >= 7 + libtool$secondaryArchSuffix = $portVersion compat >= 2.4 + cmd:libtool$secondaryArchSuffix = $portVersion compat >= 2.4 + cmd:libtoolize$secondaryArchSuffix = $portVersion compat >= 2.4 + devel:libltdl$secondaryArchSuffix = 7.3.0 compat >= 7 " REQUIRES=" - haiku >= $haikuVersion - libtool_libltdl == $portVersion base + haiku$secondaryArchSuffix >= $haikuVersion + libtool_libltdl$secondaryArchSuffix == $portVersion base cmd:aclocal cmd:automake cmd:sed @@ -35,12 +36,12 @@ REQUIRES=" BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:aclocal cmd:autoconf >= 2.62 cmd:autoheader >= 2.62 cmd:find - cmd:gcc + cmd:gcc$secondaryArchSuffix cmd:ld cmd:make cmd:nm @@ -92,9 +93,9 @@ TEST() SUMMARY_libltdl="The libtool libltdl library" PROVIDES_libltdl=" - libtool_libltdl = $portVersion compat >= 2.4 - lib:libltdl = 7.3.0 compat >= 7 + libtool_libltdl$secondaryArchSuffix = $portVersion compat >= 2.4 + lib:libltdl$secondaryArchSuffix = 7.3.0 compat >= 7 " REQUIRES_libltdl=" - haiku >= $haikuVersion + haiku$secondaryArchSuffix >= $haikuVersion "