From 4bda5125097fd4d22c51c969225a0a47086d91ee Mon Sep 17 00:00:00 2001 From: Jesus Rivero Date: Tue, 23 Aug 2011 19:03:37 +0000 Subject: [PATCH] Applied patch from upstream, wrt bug #376303. Fixed License Package-Manager: portage-2.2.0_alpha46/cvs/Linux i686 --- dev-lang/python/ChangeLog | 6 ++- dev-lang/python/Manifest | 13 ++--- .../python/files/python-3.2-soname_typo.patch | 51 +++++++++++++++++++ dev-lang/python/python-3.2-r2.ebuild | 7 ++- 4 files changed, 68 insertions(+), 9 deletions(-) create mode 100644 dev-lang/python/files/python-3.2-soname_typo.patch diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog index badee20503a6..6851d8b59172 100644 --- a/dev-lang/python/ChangeLog +++ b/dev-lang/python/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/python # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.542 2011/08/07 09:58:09 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.543 2011/08/23 19:03:37 neurogeek Exp $ + + 23 Aug 2011; Jesus Rivero python-3.2-r2.ebuild, + +files/python-3.2-soname_typo.patch: + Applied patch from upstream, wrt bug #376303. Fixed License 07 Aug 2011; Naohiro Aota python-2.6.7-r2.ebuild, python-2.7.2-r2.ebuild, python-3.1.4-r2.ebuild, python-3.2-r2.ebuild: diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest index 55f47efd9cb0..823d9bf2e4dd 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -7,6 +7,7 @@ AUX python-2.4.4-test-cross.patch 977 RMD160 8fdcd45dc202993988f7a1c2b3d91806888 AUX python-2.5-cross-printf.patch 903 RMD160 8dc0ee148120aaf7667624bdb5574bb6af5d2a00 SHA1 596e05be8cde43e4cdd87c8ed06ebb40828f7cea SHA256 1e91e5123d74d89aa8fc9dc60d98516b785f851e43da9b634ae535130e24e780 AUX python-2.6-chflags-cross.patch 1716 RMD160 b0ec772a41a24d51f4c7430b19bcc6251cd6be87 SHA1 4745cd53cef503c41c50573ad97f40eb89fd4bcd SHA256 7c36689db47720052069725036983c2fb6959f425e3777aae55976b2788d463f AUX python-2.6-test-cross.patch 914 RMD160 1f421b5565d39a24b887e85cbecaf3857741f756 SHA1 9c05fbe28aac6373f24317db5c277bc4549dde0c SHA256 8264f6ffe5aedcce67bea00b0346e5416a5486da2229bf82fe748d87ec65c4de +AUX python-3.2-soname_typo.patch 1724 RMD160 1b112382152731768b655279145c7caa31d1094f SHA1 808fdab3b1d1664fc20c67dce008e7ea48134a4e SHA256 776366c3cc67c7d66883846acee8cc1b795c25f6e35e927793be8c54162491e2 AUX python-config-2.4-r1 1624 RMD160 e4e6893c9e8414289c0c70c0f4be58835911e376 SHA1 addf9a6eb81e636364264a6abb3d96f01ea0cf90 SHA256 923a9e896f99cca5aa4ccbb02f981c6e26a2b1aa42326de2359d3c884bde2a9f DIST Python-2.4.6.tar.bz2 8154677 RMD160 0687989193dec2ac108142759281be7ddcf7f31e SHA1 cb1972a554a458f6a26d3e047b359251865d7c96 SHA256 da104139ad3f4534482942ac02cf8f8ed9badd370ffa14f06b07c44914423e08 DIST Python-2.5.4.tar.bz2 9821313 RMD160 3a76c83464c3b1c38a60351ab054e33ac7195663 SHA1 0f2e819d6381f72f26c734e00a6780b3933ea404 SHA256 bc8d896a2bfe5523ba93b8d89b71017b74e8e6cb21dc676a0ccff668c8780110 @@ -39,13 +40,13 @@ EBUILD python-2.7.1-r2.ebuild 11588 RMD160 39548918ba1768e74d18331f3de63d8868607 EBUILD python-2.7.2-r2.ebuild 12210 RMD160 9d7ec19ee3372fd9f1b441f8789a38d6e54ac896 SHA1 017be68bdf8951ace65785ac09272cc30c1c6a5e SHA256 bd8a4e0e5c88f84106a074bb65f99373aaf184889afae192b71c5b7088b51979 EBUILD python-3.1.3-r1.ebuild 9798 RMD160 20b97be4899f2adba70e79d24134d11e31d1c513 SHA1 b61c32e968662d7c2984221ea48146b020d56498 SHA256 a2680419e5280a2e354a4491bd8a95094675473cf31ae8a7c07f6847fcb16703 EBUILD python-3.1.4-r2.ebuild 10703 RMD160 b73fa313c117372a5a6a178e9a1fd2f7fa962af6 SHA1 fd63c7da325fd535e6521b232f2957af871e8f3d SHA256 2e8b4ba037c3616f12fc42688337a319dd2d55a6d5ab6b6f2d37be6b277e7826 -EBUILD python-3.2-r2.ebuild 10678 RMD160 2f334b54288a06c2911264a971f9d0aee06bdbee SHA1 8a2abcd9653637cf5c4e663ce7ed72a5283847f5 SHA256 bdb41a5e729779e043a4d20f073d3d6e2a3e50f8bd189726c301a491a57c5fb6 -MISC ChangeLog 97299 RMD160 7c752cbdf12e899b0c5cb3dd1ad1b8e4edbba1c1 SHA1 f8ae4c159cee1af15f25fc321f7066c3fbdf4ea0 SHA256 aaf55d90d627960888ff997b4cf79c5ff7420d456f704fc569fc84654ef5ffc2 +EBUILD python-3.2-r2.ebuild 10773 RMD160 c9382c6da7738936c57461909a3eb16c74f171a4 SHA1 27d961b9fe9676d68bac0603e63d4f4b6d35ca99 SHA256 f98e550068b32d2526b3d8e487da74e4b2572bf388587f03a3b36942a9657c1d +MISC ChangeLog 97478 RMD160 1e89459d07596c1c86817bf829cb4a36ea4fa360 SHA1 2b46a873196904388db468ded46838ca92675c11 SHA256 05d7b350b40ebd5224eabcd39eb71fa7e12e6400c5485eb35cec8ff643a1e204 MISC metadata.xml 661 RMD160 54831d16b8807086bfabdbb3df9d33336b5d42a0 SHA1 9867c337fe9e6f4e967004fc9409763e0fedf43b SHA256 2c6c3407251f7ccd6501dee49494e539a9544f2fbae99a4373eefdf4e83e8908 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.16 (GNU/Linux) -iEYEARECAAYFAk4+Yc0ACgkQGpDnPLSHuMCpywCePYxg3+b6CsaETdIH2xno/wMi -piAAnRDhGldVTtrivVOP5FWcqy99647J -=ZIPL +iEYEARECAAYFAk5T+eQACgkQdIssYB9vBoNS4gCeLyXT2/sEyJ19/dVzh0nTpN4a +/wgAn0C/Aihm5zDcmhwDzpJ8loMLcWa9 +=xDgP -----END PGP SIGNATURE----- diff --git a/dev-lang/python/files/python-3.2-soname_typo.patch b/dev-lang/python/files/python-3.2-soname_typo.patch new file mode 100644 index 000000000000..357274c491df --- /dev/null +++ b/dev-lang/python/files/python-3.2-soname_typo.patch @@ -0,0 +1,51 @@ +# HG changeset patch +# User Martin v. Löwis +# Date 1304919465 -7200 +# Node ID 749686064642118c5ccc8ad28105472321931353 +# Parent 4f3f67a595fb05f04d89ed906df911b743e47463 +Use --as-needed when linking libpython3.so. Closes #11347. +Patch by Arfrever Frehtes Taifersar Arahesis. + +diff --git a/Makefile.pre.in b/Makefile.pre.in +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -76,6 +76,7 @@ PY_CFLAGS= $(BASECFLAGS) $(OPT) $(CONFIG + # environment variables + PY_CPPFLAGS= -I. -IInclude -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS) + PY_LDFLAGS= $(CONFIGURE_LDFLAGS) $(LDFLAGS) ++NO_AS_NEEDED= @NO_AS_NEEDED@ + LDLAST= @LDLAST@ + SGI_ABI= @SGI_ABI@ + CCSHARED= @CCSHARED@ +@@ -459,7 +460,7 @@ libpython$(LDVERSION).so: $(LIBRARY_OBJS + fi + + libpython3.so: libpython$(LDVERSION).so +- $(BLDSHARED) -o $@ -Wl,-hl$@ $^ ++ $(BLDSHARED) $(NO_AS_NEEDED) -o $@ -Wl,-h$@ $^ + + libpython$(LDVERSION).dylib: $(LIBRARY_OBJS) + $(CC) -dynamiclib -Wl,-single_module $(PY_LDFLAGS) -undefined dynamic_lookup -Wl,-install_name,$(prefix)/lib/libpython$(LDVERSION).dylib -Wl,-compatibility_version,$(VERSION) -Wl,-current_version,$(VERSION) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ +diff --git a/configure.in b/configure.in +--- a/configure.in ++++ b/configure.in +@@ -525,6 +525,18 @@ then + fi + + ++AC_MSG_CHECKING([for -Wl,--no-as-needed]) ++save_LDFLAGS="$LDFLAGS" ++LDFLAGS="$LDFLAGS -Wl,--no-as-needed" ++AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])], ++ [NO_AS_NEEDED="-Wl,--no-as-needed" ++ AC_MSG_RESULT([yes])], ++ [NO_AS_NEEDED="" ++ AC_MSG_RESULT([no])]) ++LDFLAGS="$save_LDFLAGS" ++AC_SUBST(NO_AS_NEEDED) ++ ++ + # checks for UNIX variants that set C preprocessor variables + AC_USE_SYSTEM_EXTENSIONS + + diff --git a/dev-lang/python/python-3.2-r2.ebuild b/dev-lang/python/python-3.2-r2.ebuild index abc20268e709..e6bdf0553e73 100644 --- a/dev-lang/python/python-3.2-r2.ebuild +++ b/dev-lang/python/python-3.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2-r2.ebuild,v 1.3 2011/08/07 09:58:09 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2-r2.ebuild,v 1.4 2011/08/23 19:03:37 neurogeek Exp $ EAPI="3" WANT_AUTOMAKE="none" @@ -29,7 +29,7 @@ else mirror://gentoo/python-gentoo-patches-${MY_PV}$([[ "${PATCHSET_REVISION}" != "0" ]] && echo "-r${PATCHSET_REVISION}").tar.bz2" fi -LICENSE="PSF-2.2" +LICENSE="PSF-2" SLOT="3.2" PYTHON_ABI="${SLOT}" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" @@ -137,6 +137,9 @@ src_prepare() { sed -e "s/\(-DSVNVERSION=\).*\( -o\)/\1\\\\\"${ESVN_REVISION}\\\\\"\2/" -i Makefile.pre.in || die "sed failed" fi + #WRT bug #376303 + epatch "${FILESDIR}/${P}-soname_typo.patch" || die "soname patch failed" + eautoreconf } -- 2.26.2