summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Haubenwallner <haubi@gentoo.org>2011-05-26 09:09:36 +0000
committerMichael Haubenwallner <haubi@gentoo.org>2011-05-26 09:09:36 +0000
commit5c63e242341f9ddefdbe2fe3ad55f042a94180f6 (patch)
treed9d03d9573781ddb324a7c23d3df7d8255df5b89 /src/patchsets/mico
parentAutomated update of outdated-cpan-packages.xml (diff)
downloadgentoo-5c63e242341f9ddefdbe2fe3ad55f042a94180f6.tar.gz
gentoo-5c63e242341f9ddefdbe2fe3ad55f042a94180f6.tar.bz2
gentoo-5c63e242341f9ddefdbe2fe3ad55f042a94180f6.zip
link libmico.so against all the configured libraries, not just ssl,crypto (bug#280678 related)
Diffstat (limited to 'src/patchsets/mico')
-rw-r--r--src/patchsets/mico/2.3.13/006_all_as-needed.patch25
1 files changed, 8 insertions, 17 deletions
diff --git a/src/patchsets/mico/2.3.13/006_all_as-needed.patch b/src/patchsets/mico/2.3.13/006_all_as-needed.patch
index 2ef5ceea15..95b83751ca 100644
--- a/src/patchsets/mico/2.3.13/006_all_as-needed.patch
+++ b/src/patchsets/mico/2.3.13/006_all_as-needed.patch
@@ -1,22 +1,13 @@
-Link libmico.so against ssl,crypto on any platform when necessary,
+Link libmico.so against configured libraries,
to get -Wl,--as-needed working. #280678.
---- orb/Makefile.orig 2009-09-08 18:25:23.157431541 +0200
-+++ orb/Makefile 2009-09-08 18:27:23.717729431 +0200
-@@ -31,7 +31,7 @@
+--- orb/Makefile.orig 2011-05-26 09:28:52.629834934 +0200
++++ orb/Makefile 2011-05-26 09:28:59.519791273 +0200
+@@ -30,7 +30,7 @@
+ endif
endif
- PLATFORM_LIBS =
--ifeq ($(HAVE_CYGWIN), yes)
-+#ifeq ($(HAVE_CYGWIN), yes)
+-PLATFORM_LIBS =
++PLATFORM_LIBS = $(CONFLIBS)
+ ifeq ($(HAVE_CYGWIN), yes)
ifeq ($(USE_CSL2), yes)
PLATFORM_LIBS := $(PLATFORM_LIBS) -lssl -lcrypto
- else
-@@ -43,7 +43,7 @@
- endif
- endif
- endif
--endif
-+#endif
-
- ifeq ($(HAVE_ORB_EXCEPTS), no)
- CXXFLAGS := $(CXXFLAGS) $(NOEHFLAGS) -DMICO_CONF_NO_EXCEPTIONS