[Pkg-corba-commits] r216 - in /trunk/omniorb/debian: changelog patches/missing_cos_linking patches/series

[flub-guest at users.alioth.debian.org]

Author: flub-guest
Date: Sun Aug  8 13:33:54 2010
New Revision: 216

URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=216
Log:
Link the COS libs against all used omniorb libs

This fixes #558942.

Added:
    trunk/omniorb/debian/patches/missing_cos_linking
Modified:
    trunk/omniorb/debian/changelog
    trunk/omniorb/debian/patches/series

Modified: trunk/omniorb/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/changelog?rev=216&op=diff
==============================================================================
--- trunk/omniorb/debian/changelog (original)
+++ trunk/omniorb/debian/changelog Sun Aug  8 13:33:54 2010
@@ -8,6 +8,8 @@
     packages to silence lintian.
   * Add $remote_fs to Required-{Start|Stop} in nameserver initscript.
   * Change string exceptions into AssertionError (closes: #585260).
+  * debian/patches/missing_cos_linking: link COS libs against all
+    used omniorb libs to make GOLD linker happy (closes: #558942).
 
  -- Floris Bruynooghe <floris.bruynooghe at gmail.com>  Wed, 14 Jul 2010 23:14:47 +0100
 

Added: trunk/omniorb/debian/patches/missing_cos_linking
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/patches/missing_cos_linking?rev=216&op=file
==============================================================================
--- trunk/omniorb/debian/patches/missing_cos_linking (added)
+++ trunk/omniorb/debian/patches/missing_cos_linking Sun Aug  8 13:33:54 2010
@@ -1,0 +1,35 @@
+--- a/src/services/mklib/dir.mk
++++ b/src/services/mklib/dir.mk
+@@ -121,13 +121,17 @@
+ dynimps := $(skshared) $(patsubst $(DLLDebugSearchPattern),$(DLLNoDebugSearchPattern), \
+          $(OMNIORB_LIB))
+ else
+-imps := $(OMNIORB_LIB_NODYN)
+-dynimps := $(OMNIORB_LIB)
++# Link COS with omniDynamic and COSDynamic with COS so all symbols are
++# resolved at link time.  Leaving symbols unresolved is ok for the normal
++# GNU and SysV linkers but not for more restrictive linkers like GOLD.
++# $(soext) is used in the $(skshared) target.
++soext := $(OMNIORB_MAJOR_VERSION).so.$(OMNIORB_MINOR_VERSION).$(OMNIORB_MICRO_VERSION)
++imps := $(OMNIORB_LIB_NODYN) -lomniDynamic$(OMNIORB_MAJOR_VERSION)
++dynimps := $(OMNIORB_LIB) -Lshared -lCOS$(OMNIORB_MAJOR_VERSION)
+ endif
+ 
+ ifdef AIX
+-# AIX thinks the skeleton stubs depend on omniDynamic and also that
+-# COSDynamic depends on COS.
++# AIX has special library names.
+ oov = $(OMNIORB_MAJOR_VERSION)$(OMNIORB_MINOR_VERSION)
+ oovm = $(oov)$(OMNIORB_MICRO_VERSION)
+ imps := -lomniORB$(oov) -lomniDynamic$(oov) $(OMNITHREAD_LIB)
+@@ -149,8 +153,9 @@
+ $(skshared): $(patsubst %, shared/%, $(COS_SK_OBJS))
+ 	@(namespec="$(sknamespec)"; extralibs="$(imps) $(extralibs)"; \
+          $(MakeCXXSharedLibrary))
++	ln -s libCOS$(soext) shared/libCOS$(OMNIORB_MAJOR_VERSION).so
+ 
+-$(dynskshared): $(patsubst %, shared/%, $(COS_DYNSK_OBJS))
++$(dynskshared): $(skshared) $(patsubst %, shared/%, $(COS_DYNSK_OBJS))
+ 	@(namespec="$(dynsknamespec)"; extralibs="$(dynimps)"; \
+          $(MakeCXXSharedLibrary))
+ 

Modified: trunk/omniorb/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb/debian/patches/series?rev=216&op=diff
==============================================================================
--- trunk/omniorb/debian/patches/series (original)
+++ trunk/omniorb/debian/patches/series Sun Aug  8 13:33:54 2010
@@ -3,3 +3,4 @@
 buildsys
 cos_stubs
 string_exceptions
+missing_cos_linking