diff options
author | Ned Ludd <solar@gentoo.org> | 2006-07-13 15:44:13 +0000 |
---|---|---|
committer | Ned Ludd <solar@gentoo.org> | 2006-07-13 15:44:13 +0000 |
commit | 88f08d76a5c023fb24a63bb74ec4fb7058c83fe0 (patch) | |
tree | cb08fc69af513f292fcf7a4f2ab567641e617b94 /sys-libs/libcap | |
parent | 1.02.00 updated to current stable. (diff) | |
download | historical-88f08d76a5c023fb24a63bb74ec4fb7058c83fe0.tar.gz historical-88f08d76a5c023fb24a63bb74ec4fb7058c83fe0.tar.bz2 historical-88f08d76a5c023fb24a63bb74ec4fb7058c83fe0.zip |
- work around broken python support when cross compile. Yanked the hack known as USE=static that should of never been added in the first place.
Package-Manager: portage-2.1.1_pre2-r7
Diffstat (limited to 'sys-libs/libcap')
-rw-r--r-- | sys-libs/libcap/ChangeLog | 6 | ||||
-rw-r--r-- | sys-libs/libcap/Manifest | 26 | ||||
-rw-r--r-- | sys-libs/libcap/libcap-1.10-r7.ebuild | 20 |
3 files changed, 23 insertions, 29 deletions
diff --git a/sys-libs/libcap/ChangeLog b/sys-libs/libcap/ChangeLog index 55c8c45dedc4..1562669a0ca2 100644 --- a/sys-libs/libcap/ChangeLog +++ b/sys-libs/libcap/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/libcap # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.35 2006/07/13 14:42:17 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/ChangeLog,v 1.36 2006/07/13 15:44:13 solar Exp $ + + 13 Jul 2006; <solar@gentoo.org> libcap-1.10-r7.ebuild: + - work around broken python support when cross compile. Yanked the hack + known as USE=static *libcap-1.10-r7 (13 Jul 2006) diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest index 0564136e9b0d..8369ad3cfbb2 100644 --- a/sys-libs/libcap/Manifest +++ b/sys-libs/libcap/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 1.10-python.patch 2796 RMD160 b8fa02d2141048c95bcd07854f3b1a079475467b SHA1 c2514ea37904469fc0e6ee7d9534210f917910b5 SHA256 52ddf875d1ab0553b66c83c01cf145f3e4c714a948a52a568dc1a7642ab3ba73 MD5 c91cacf89f9e42e3f7ae3fc8c4fb8501 files/1.10-python.patch 2796 RMD160 b8fa02d2141048c95bcd07854f3b1a079475467b files/1.10-python.patch 2796 @@ -27,14 +24,14 @@ EBUILD libcap-1.10-r6.ebuild 2329 RMD160 9a42135c8b900669cb4ded857fc1e971446d46c MD5 ef5095f2738bb7224757a0894be24242 libcap-1.10-r6.ebuild 2329 RMD160 9a42135c8b900669cb4ded857fc1e971446d46cc libcap-1.10-r6.ebuild 2329 SHA256 55fb4da87e17a44487f1c62c4d6d6be1df553b46c81f8184c71180cbf870ce4d libcap-1.10-r6.ebuild 2329 -EBUILD libcap-1.10-r7.ebuild 2205 RMD160 9c7d2f50610b0696ccaf2157f5f6493fd1c504fc SHA1 4aa8f6cbefd94b93e4f687f289c21bfc5559fba8 SHA256 22e31c98d1809be850cf7e497bd1400c95d9fc3203910d5101f6d57d8b020f9a -MD5 7b8f3f20d790803b7d94ac8422f71f07 libcap-1.10-r7.ebuild 2205 -RMD160 9c7d2f50610b0696ccaf2157f5f6493fd1c504fc libcap-1.10-r7.ebuild 2205 -SHA256 22e31c98d1809be850cf7e497bd1400c95d9fc3203910d5101f6d57d8b020f9a libcap-1.10-r7.ebuild 2205 -MISC ChangeLog 4777 RMD160 7d71debd284f3ad7d0544813c2cdf80e720b27a7 SHA1 3c62810fdb4275563ba5f7e41ae30e5efea027a0 SHA256 9508f72958e38c243834a15b20834fdd6ccdc9014e4373a190719e965ede5c9b -MD5 1eeab755c086062e290358311a5de4c2 ChangeLog 4777 -RMD160 7d71debd284f3ad7d0544813c2cdf80e720b27a7 ChangeLog 4777 -SHA256 9508f72958e38c243834a15b20834fdd6ccdc9014e4373a190719e965ede5c9b ChangeLog 4777 +EBUILD libcap-1.10-r7.ebuild 2339 RMD160 2fa6dab30bfc9e6746a524268b4fceb25c87414f SHA1 d8dbd8c3170628fbfc9150cf7f7836bc5274e5bb SHA256 19923c296d1c28f462a536e651def025526a3b070e0338fd51148ddf205f896d +MD5 99314bf33078dffca03aff8e61884980 libcap-1.10-r7.ebuild 2339 +RMD160 2fa6dab30bfc9e6746a524268b4fceb25c87414f libcap-1.10-r7.ebuild 2339 +SHA256 19923c296d1c28f462a536e651def025526a3b070e0338fd51148ddf205f896d libcap-1.10-r7.ebuild 2339 +MISC ChangeLog 4930 RMD160 c9a7171aec0e73330463104885505b8f6ec6ea48 SHA1 fe62ab5146738479ba6cf00b644a4ae2d6eb8ff5 SHA256 7226e083487e4b9907cb680d8920aed649f47437f952ff02acdf50d98947d0f8 +MD5 05474904e0fe53d2c545bc0b007aaeee ChangeLog 4930 +RMD160 c9a7171aec0e73330463104885505b8f6ec6ea48 ChangeLog 4930 +SHA256 7226e083487e4b9907cb680d8920aed649f47437f952ff02acdf50d98947d0f8 ChangeLog 4930 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 @@ -48,10 +45,3 @@ SHA256 0c2c285d91fc3605182cc8a81e65f0a10aa374b1f52b01851113a012daa8de6b files/di MD5 ad5f4999ea61a88174e7e84d9a8f84f4 files/digest-libcap-1.10-r7 479 RMD160 ea3f38f4e3ac734b57ec52bf61e09d058e027dbf files/digest-libcap-1.10-r7 479 SHA256 0c2c285d91fc3605182cc8a81e65f0a10aa374b1f52b01851113a012daa8de6b files/digest-libcap-1.10-r7 479 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.4 (GNU/Linux) - -iD8DBQFEtlxD1ZcsMnZjRyIRAuWhAJ9KLS54HLWBloZMN0c6F3NULxZFyQCfd+eK -F260T0LCCBmhkgWN2B+Upug= -=VMlu ------END PGP SIGNATURE----- diff --git a/sys-libs/libcap/libcap-1.10-r7.ebuild b/sys-libs/libcap/libcap-1.10-r7.ebuild index efb7fe7e00a5..1ff396ebaa58 100644 --- a/sys-libs/libcap/libcap-1.10-r7.ebuild +++ b/sys-libs/libcap/libcap-1.10-r7.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-1.10-r7.ebuild,v 1.1 2006/07/13 14:42:17 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/libcap/libcap-1.10-r7.ebuild,v 1.2 2006/07/13 15:44:13 solar Exp $ -inherit flag-o-matic eutils python +inherit flag-o-matic eutils python toolchain-funcs DEB_PVER="14" DESCRIPTION="POSIX 1003.1e capabilities" @@ -13,7 +13,7 @@ SRC_URI="http://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.4/${ LICENSE="GPL-2 BSD" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="nocxx python static" +IUSE="nocxx python" #patch is in recent 2.2 kernels so it works there DEPEND="virtual/os-headers @@ -36,11 +36,12 @@ src_unpack() { src_compile() { local myflags= - if use static; then - append-flags -static - append-ldflags -static - fi - if ! use nocxx && use python ; then + # -static is never should never be used on shared objects like a lib. + #if use static; then + # append-flags -static + # append-ldflags -static + #fi + if ! tc-is-cross-compiler && ! use nocxx && use python ; then python_version myflags="${myflags} PYTHON=1 PYTHONMODDIR=/usr/$(get_libdir)/python${PYVER}/site-packages" append-flags "-I/usr/include/python${PYVER}" @@ -63,7 +64,7 @@ src_install() { dodoc CHANGELOG README pgp.keys.asc doc/capability.notes capfaq-0.2.txt doman doc/*.3 - if ! use nocxx && use python ; then + if ! tc-is-cross-compiler && ! use nocxx && use python ; then python_version local PYTHONMODDIR="/usr/$(get_libdir)/python${PYVER}/site-packages" exeinto "${PYTHONMODDIR}" @@ -72,4 +73,3 @@ src_install() { doins libcap/libcap.py fi } - |