From fee2c14979e03597e9f63a8f0f8e4c9fa14a261a Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Fri, 7 May 2010 12:28:06 +0000 Subject: [PATCH] Fixed undefined symbols Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- dev-libs/libf2c/ChangeLog | 10 +++++++++- dev-libs/libf2c/Manifest | 13 +++++++------ .../20090407-link-shared-libf2c-correctly.patch | 2 +- dev-libs/libf2c/files/20090407-main.patch | 15 +++++++++++++++ ...-20090407.ebuild => libf2c-20090407-r1.ebuild} | 3 ++- 5 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 dev-libs/libf2c/files/20090407-main.patch rename dev-libs/libf2c/{libf2c-20090407.ebuild => libf2c-20090407-r1.ebuild} (94%) diff --git a/dev-libs/libf2c/ChangeLog b/dev-libs/libf2c/ChangeLog index d317eea37a83..82babccd1d16 100644 --- a/dev-libs/libf2c/ChangeLog +++ b/dev-libs/libf2c/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-libs/libf2c # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libf2c/ChangeLog,v 1.34 2010/03/31 19:45:01 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libf2c/ChangeLog,v 1.35 2010/05/07 12:28:06 jlec Exp $ + +*libf2c-20090407-r1 (07 May 2010) + + 07 May 2010; Justin Lecher + files/20090407-link-shared-libf2c-correctly.patch, + -libf2c-20090407.ebuild, +files/20090407-main.patch, + +libf2c-20090407-r1.ebuild: + Fixed undefined symbols 31 Mar 2010; Justin Lecher libf2c-20090407.ebuild: USE static -> statis-libs, #312465 diff --git a/dev-libs/libf2c/Manifest b/dev-libs/libf2c/Manifest index 33171e293563..93b886282487 100644 --- a/dev-libs/libf2c/Manifest +++ b/dev-libs/libf2c/Manifest @@ -3,17 +3,18 @@ Hash: SHA1 AUX 20051004-add-ofiles-dep.patch 439 RMD160 c4ca7645c0df795c8cc9be31cb6e9704a9b6285a SHA1 4453a9f1e4d59e87cd4a1a0ef1bc780bca6917d0 SHA256 3f688297b45515c1e386bb7f94ad36bf0f6a3497a0baff759b54d943cbec7d8f AUX 20070912-link-shared-libf2c-correctly.patch 356 RMD160 e979e8870e063f2f5b6764b0c199a13e940f2c64 SHA1 f8192db58e9c66984c77da74db4b07b6913d9023 SHA256 23e36c6802d29bdec559b59fbd9713f21a28896307647149601a99767c4c58db -AUX 20090407-link-shared-libf2c-correctly.patch 358 RMD160 18d38638a542dc00b6ff3b1c03f7ecaaa2cb5ec8 SHA1 142235a5504bd725f157ff61c82e649a9b0e79f4 SHA256 32d80ec1dfaf4af785cf6d66ed9082ab6d9d1248ac40149ef3a83b8338311898 +AUX 20090407-link-shared-libf2c-correctly.patch 358 RMD160 a0836cce704351571c0abaf95022091042f7f50d SHA1 cced6bdb9ca5cf1d2f2fcc4dd1be80f2f070285b SHA256 28e04d4fe1279ad37fba92f1fc9acb3110778a02f4c15da6b659b04baa3d2df0 +AUX 20090407-main.patch 242 RMD160 e177c559022f00c4cc7af71e2b10f059e2ef3bd8 SHA1 2e322d3b129da68d5d118e1584da38f03ef60a90 SHA256 66e666adbcc5362b8cc31776932ef3e572811a1dff8700cac8a73cfba482c832 DIST libf2c-20070912.zip 128622 RMD160 bc2da3c0a61583cca238995c43871cf2221aa404 SHA1 d84e692cc295adb45a80ae888db920b582fa49d6 SHA256 9403da6e0ea3f20012f351ff1525efd7fc0d696b82ab7219f711f21e73d09ec0 DIST libf2c-20090407.zip 128822 RMD160 090023bc8cb548d1f1ed9684d22e30c01293a4d5 SHA1 786a282571ffb9ade10e63ceff80ca33d452c821 SHA256 5b3503d1560f0f12649baa94ad5ce8ff7e363ca3507c10bfc4afc8cfdb07fe92 EBUILD libf2c-20070912.ebuild 1397 RMD160 5b1ee8bdf78a2bd1814cf61838e0f8d2d7d6e2c7 SHA1 2a70ccf171b9b3541ffd2447b1cb0e29403a2dc8 SHA256 aa0ae1682adbeafb0e99e521e3ee540041763e3af7ed9ce69316344d75ec4f87 -EBUILD libf2c-20090407.ebuild 1476 RMD160 f5751cdf5197d9c6417e3fdfa4143f2e70050088 SHA1 2be87860b9d2b6e8162ad952c22ce83d127fad58 SHA256 3294e363318008bdeec4f701faa893349d0b1dca587bdf088da193a7bad8bf62 -MISC ChangeLog 4794 RMD160 876afd980bd658657eacc19ae7dfed876cc9c248 SHA1 859726ce5cf0debb599c66f1f0b3951380f12d7e SHA256 a97a1cb16f8f66c83d82d8d8fb80558a196bac07c32eb6d4e63a6f0bebb16de8 +EBUILD libf2c-20090407-r1.ebuild 1518 RMD160 2eaf144a151ea5099375de0680cd79f8969a0668 SHA1 eb4b5e08c5c162e41f281f68e46fac910fdcc6d3 SHA256 28d343431232dbf970d491bf3e3da8fafc5adc8e8e399610dc30081f09f9d2df +MISC ChangeLog 5041 RMD160 7c7a34a7bb37dea2f1ad7fcb3c6636d8f44422d0 SHA1 5227259e12998ec219c16e9e280256ba63841a52 SHA256 9c99f1c74962a87ac9c7547dcfae19689e254d0d2619c2488151c02618d0b44b MISC metadata.xml 157 RMD160 ed43b99e7bf8bbf62cf4e46152138ab42d3a88c5 SHA1 2182a6de0b10959aad51af2990f1a6c69e34dd97 SHA256 750cb9e46ac2b77e1adf73de43c186a8c2d2234a9c6a89d9358d0969dc5cf8ac -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkuzp2cACgkQgAnW8HDreRbLDgCgrnpHbUX+moJJ0r3850CpKM0G -ia0An3RmGL0A1C7C3bxZTkTWbH/9vfbi -=SLRb +iEYEARECAAYFAkvkB10ACgkQgAnW8HDreRZjRACgukMqu7M8KwilWMomlI/4w7p6 +TrcAoKgVjYRvg8imiC3dAHQ63/WOZUoi +=sWQ2 -----END PGP SIGNATURE----- diff --git a/dev-libs/libf2c/files/20090407-link-shared-libf2c-correctly.patch b/dev-libs/libf2c/files/20090407-link-shared-libf2c-correctly.patch index 35b3bb135c08..d35e60bed0ff 100644 --- a/dev-libs/libf2c/files/20090407-link-shared-libf2c-correctly.patch +++ b/dev-libs/libf2c/files/20090407-link-shared-libf2c-correctly.patch @@ -5,7 +5,7 @@ libf2c.so: $(OFILES) - $(CC) -shared -o libf2c.so $(OFILES) -+ $(CC) -shared $(LDFLAGS) -Wl,-soname,libf2c.so.2 -lm $(OFILES) -o libf2c.so.2 ++ $(CC) -shared $(LDFLAGS) -Wl,-soname,libf2c.so.2 $(OFILES) -o libf2c.so.2 -lm ### If your system lacks ranlib, you don't need it; see README. diff --git a/dev-libs/libf2c/files/20090407-main.patch b/dev-libs/libf2c/files/20090407-main.patch new file mode 100644 index 000000000000..5e16b9f2fad2 --- /dev/null +++ b/dev-libs/libf2c/files/20090407-main.patch @@ -0,0 +1,15 @@ +diff --git a/main.c b/main.c +index d95fdc9..cf15b7d 100644 +--- a/main.c ++++ b/main.c +@@ -135,7 +135,9 @@ f_init(); + #ifndef NO_ONEXIT + ONEXIT(f_exit); + #endif +-MAIN__(); ++int MAIN__( ) ++ { return(0); ++} + #ifdef NO_ONEXIT + f_exit(); + #endif diff --git a/dev-libs/libf2c/libf2c-20090407.ebuild b/dev-libs/libf2c/libf2c-20090407-r1.ebuild similarity index 94% rename from dev-libs/libf2c/libf2c-20090407.ebuild rename to dev-libs/libf2c/libf2c-20090407-r1.ebuild index cc7c6ff31e5c..241f6527d049 100644 --- a/dev-libs/libf2c/libf2c-20090407.ebuild +++ b/dev-libs/libf2c/libf2c-20090407-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libf2c/libf2c-20090407.ebuild,v 1.3 2010/03/31 19:49:52 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libf2c/libf2c-20090407-r1.ebuild,v 1.1 2010/05/07 12:28:06 jlec Exp $ EAPI=2 inherit toolchain-funcs eutils @@ -25,6 +25,7 @@ S="${WORKDIR}/${PN}" src_prepare() { epatch "${FILESDIR}"/20051004-add-ofiles-dep.patch epatch "${FILESDIR}"/${PV}-link-shared-libf2c-correctly.patch + epatch "${FILESDIR}"/${PV}-main.patch } src_compile() { -- 2.26.2