diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2012-02-09 15:11:16 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2012-02-09 15:11:16 +0000 |
| commit | c10638144cb03d192588dc3e982fde333db5afd2 (patch) | |
| tree | a8d816d74186923dec48db02a8fd3992a5ede611 /gnustep-base | |
| parent | Raise dev-libs/boost dep, fixes bug #402863. (diff) | |
| download | historical-c10638144cb03d192588dc3e982fde333db5afd2.tar.gz historical-c10638144cb03d192588dc3e982fde333db5afd2.tar.bz2 historical-c10638144cb03d192588dc3e982fde333db5afd2.zip | |
Always set libobjc.so version to ease switching to libobjc2
Package-Manager: portage-2.2.0_alpha85/cvs/Linux x86_64
Diffstat (limited to 'gnustep-base')
| -rw-r--r-- | gnustep-base/gnustep-make/ChangeLog | 6 | ||||
| -rw-r--r-- | gnustep-base/gnustep-make/Manifest | 10 | ||||
| -rw-r--r-- | gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild | 11 |
3 files changed, 17 insertions, 10 deletions
diff --git a/gnustep-base/gnustep-make/ChangeLog b/gnustep-base/gnustep-make/ChangeLog index 23e4ad5aefad..6f00b92c103a 100644 --- a/gnustep-base/gnustep-make/ChangeLog +++ b/gnustep-base/gnustep-make/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnustep-base/gnustep-make # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.103 2012/02/08 14:37:37 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/ChangeLog,v 1.104 2012/02/09 15:11:16 voyageur Exp $ + + 09 Feb 2012; Bernard Cafarelli <voyageur@gentoo.org> + gnustep-make-2.6.2.ebuild: + Always set libobjc.so version to ease switching to libobjc2 *gnustep-make-2.6.2 (08 Feb 2012) diff --git a/gnustep-base/gnustep-make/Manifest b/gnustep-base/gnustep-make/Manifest index 49bf036da854..76214c9b9918 100644 --- a/gnustep-base/gnustep-make/Manifest +++ b/gnustep-base/gnustep-make/Manifest @@ -13,13 +13,13 @@ DIST gnustep-make-2.6.2.tar.gz 562770 RMD160 683b6a034d4bb7e17b64209c7e7e289e9e9 EBUILD gnustep-make-2.4.0.ebuild 2335 RMD160 fb557f9e3ccbbe3c9d6505b5ea0240c5bf45be4f SHA1 6f8d32ff50ebe43e7697cde8f3f2c9307858430c SHA256 3efca9d4073527e756cfbc562cef3eb4b9c0dd09032be33ff89fe9be141883a1 EBUILD gnustep-make-2.6.0.ebuild 2488 RMD160 4269a947fe5c159525e1f9773913889d03fe7812 SHA1 4f916eb0f834a930ccede5e3fc0a0f0a29a76b01 SHA256 cb622ead93fe859763c2266979ab02f27e3c578ef639c1e08b59352f895bb208 EBUILD gnustep-make-2.6.1-r1.ebuild 2486 RMD160 46faa0e60887bea22eb5a4b585c5818be1255e27 SHA1 cdce750b077ccbfee4512f3aa0e6047f82834107 SHA256 f1ed6fbd1c5c1443662e4d330c9db4b16fb2eea7565f87637f925904bd6041a6 -EBUILD gnustep-make-2.6.2.ebuild 3104 RMD160 da148aff58cf803fd6c36553619580b1f8077701 SHA1 9f23c8b94e1961867feae9c3781f6cf99c7fbecd SHA256 a1a6a5287d39e53ef80afe791b4c8856438ddbde6719dcd453042521e01c9d5e -MISC ChangeLog 19215 RMD160 93a454cb462e180aad1e858acf3e89a8d0440528 SHA1 aaac05ebe76e1f023f16fa1fc26b95952c1b52fa SHA256 0f102ca6a91f2de7fbddee0529e842b23e22dde6e4b80964b115e69ae905155f +EBUILD gnustep-make-2.6.2.ebuild 3148 RMD160 937852c8579efcb9ab6f90b1762634f9d76fdfc7 SHA1 19844b709e030432f629eb9a9191509872811b30 SHA256 faefe31407f525c71249ec981fc743bcacdd33665582a73c8ff5c98469e35490 +MISC ChangeLog 19362 RMD160 94521f908d8a615b03e58148ce8b31d5bef3eb63 SHA1 0fe041b1d846d835bbb78383d8c9d27c8b5c9df0 SHA256 26df2b1958e8878d9be30a4d4395cd8e6fdd95663a00b9060bd13a4e09708efd MISC metadata.xml 898 RMD160 b9f3536bfebd8b110106c0acd25867ee18ee8913 SHA1 5c8af107c44ff235ab4817c553059aaee486af36 SHA256 00307fc5770d94f69c9c30ce99884a198bb71c5a14e85454b9bf164abc1f8b0f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk8yiMMACgkQFYEBGcdFJfJTdwD6Amxcx6HFnAd9z07GMsSIfsGv -vHg68tVqGZP+aehonRUA/1WtCHMoJkIGnv54Nn10Nb0yE6sD2Dk/cdhl3bFe4uR2 -=VXYF +iF4EAREIAAYFAk8z4h8ACgkQFYEBGcdFJfLlngEAhv4z4pXy3iwY2//9N8e+YI0b +URYj0v9Vo9Z6kfjAXSgA/2L1ym1UDAwdaOCJCfLn/wO3z1l02M8OdhvDh6eOjUQD +=pbU8 -----END PGP SIGNATURE----- diff --git a/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild index 689194fdaf7f..4dc095f4d83d 100644 --- a/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild +++ b/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild,v 1.1 2012/02/08 14:37:37 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-make/gnustep-make-2.6.2.ebuild,v 1.2 2012/02/09 15:11:16 voyageur Exp $ EAPI=4 @@ -19,8 +19,7 @@ DEPEND="${GNUSTEP_CORE_DEPEND} >=sys-devel/make-3.75 libobjc2? ( gnustep-base/libobjc2 >=sys-devel/clang-2.9 ) - !libobjc2? ( !gnustep-base/libobjc2 - >=sys-devel/gcc-3.3[objc] )" + !libobjc2? ( >=sys-devel/gcc-3.3[objc] )" RDEPEND="${DEPEND}" pkg_setup() { @@ -43,15 +42,19 @@ src_prepare() { } src_configure() { + local libobjc_version if use libobjc2; then export CC=clang + libobjc_version=4 + else + libobjc_version=2 fi #--enable-objc-nonfragile-abi: only working in clang for now - #--with-objc-lib-flag: TODO use to force libobjc2 or not econf \ --with-layout=fhs-system \ --with-config-file="${EPREFIX}"/etc/GNUstep/GNUstep.conf \ + --with-objc-lib-flag=-l:libobjc.so.${libobjc_version} \ $(use_enable libobjc2 objc-nonfragile-abi) \ $(use_enable native-exceptions native-objc-exceptions) } |