Package: salome
Version: 5.1.3-12
Severity: important
Tags: patch
User: [email protected]
Usertags: origin-ubuntu natty ubuntu-patch
User: [email protected]
Usertags: no-add-needed
Note, this is only a patch for the first "module" KERNEL_SRC, but I assume the
pattern for the other modules is clear. The common issue is that the binaries
are not linked with the libs containing symbols which are directly used.
--- ./KERNEL_SRC_5.1.3/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx~ 2009-12-01 15:58:49.000000000 +0100
+++ ./KERNEL_SRC_5.1.3/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx 2010-12-20 12:50:37.318228467 +0100
@@ -907,8 +907,6 @@
if(myNoteBookVars.empty())
return dump;
- Kernel_Utils::Localizer loc;
-
dump += "####################################################\n";
dump += "## Begin of NoteBook variables section ##\n";
dump += "####################################################\n";
--- ./KERNEL_SRC_5.1.3/src/Logger/Makefile.am~ 2009-12-01 15:58:41.000000000 +0100
+++ ./KERNEL_SRC_5.1.3/src/Logger/Makefile.am 2010-12-20 11:28:26.878226678 +0100
@@ -43,7 +43,7 @@
SALOME_Logger_Server_main.cxx \
SALOME_Logger_Server.hxx
-SALOME_Logger_Server_LDADD = libSalomeLoggerServer.la
+SALOME_Logger_Server_LDADD = libSalomeLoggerServer.la $(top_builddir)/idl/libSalomeIDLKernel.la $(CORBA_LIBS)
SALOME_Logger_Server_CPPFLAGS =\
-I$(top_builddir)/idl \
-I$(srcdir)/../SALOMELocalTrace \
--- ./KERNEL_SRC_5.1.3/src/Container/Makefile.am~ 2009-12-01 15:58:41.000000000 +0100
+++ ./KERNEL_SRC_5.1.3/src/Container/Makefile.am 2010-12-20 12:40:05.748229536 +0100
@@ -141,10 +141,8 @@
SALOME_Container_LDADD = \
libSalomeContainer.la \
- ../Basics/libSALOMEBasics.la \
- $(HDF5_LIBS) \
- $(CORBA_LIBS) \
- $(PYTHON_LIBS)
+ $(COMMON_LIBS) \
+ $(HDF5_LIBS)
if WITH_MPI_SEQ_CONTAINER
SALOME_Container_LDADD += $(MPI_LIBS)
@@ -161,10 +159,8 @@
TestSalome_file_LDADD =\
libSalomeContainer.la \
- ../Basics/libSALOMEBasics.la \
- $(HDF5_LIBS) \
- $(CORBA_LIBS) \
- $(PYTHON_LIBS)
+ $(COMMON_LIBS) \
+ $(HDF5_LIBS)
install-data-hook:
@for f in $(dist_salomescript_PYTHON) ; do \
--- ./KERNEL_SRC_5.1.3/src/TestContainer/Makefile.am~ 2009-12-01 15:58:49.000000000 +0100
+++ ./KERNEL_SRC_5.1.3/src/TestContainer/Makefile.am 2010-12-20 12:42:56.268229250 +0100
@@ -96,11 +96,11 @@
TestContainer_SOURCES = TestContainer.cxx
TestContainer_CPPFLAGS = $(COMMON_CPPFLAGS)
TestContainer_LDADD = libSalomeTestComponentEngine.la \
- ../Basics/libSALOMEBasics.la \
+ $(COMMON_LIBS) \
$(CORBA_LIBS)
TestLogger_SOURCES = TestLogger.cxx
TestLogger_CPPFLAGS = $(COMMON_CPPFLAGS)
TestLogger_LDADD = libSalomeTestComponentEngine.la \
- ../Basics/libSALOMEBasics.la \
+ $(COMMON_LIBS) \
$(CORBA_LIBS)
--- ./KERNEL_SRC_5.1.3/src/Registry/Makefile.am~ 2009-12-01 15:58:48.000000000 +0100
+++ ./KERNEL_SRC_5.1.3/src/Registry/Makefile.am 2010-12-20 12:23:31.048235847 +0100
@@ -60,7 +60,10 @@
SALOME_Registry_Server_SOURCES = SALOME_Registry_Server.cxx
SALOME_Registry_Server_LDADD =\
libRegistry.la \
+ ../NamingService/libSalomeNS.la \
+ ../Utils/libOpUtil.la \
../Basics/libSALOMEBasics.la \
+ $(top_builddir)/idl/libSalomeIDLKernel.la \
@CORBA_LIBS@
SALOME_Registry_Server_CPPFLAGS =\
-I$(srcdir)/../Basics \
--- ./KERNEL_SRC_5.1.3/src/SALOMEDSImpl/Makefile.am~ 2009-12-01 15:58:49.000000000 +0100
+++ ./KERNEL_SRC_5.1.3/src/SALOMEDSImpl/Makefile.am 2010-12-20 12:46:49.728228977 +0100
@@ -229,4 +229,4 @@
testDS_SOURCES = testDS.cxx
testDS_CPPFLAGS = $(COMMON_CPPFLAGS)
testDS_LDADD = libSalomeDSImpl.la \
- $(HDF5_LIBS) $(CORBA_LIBS)
+ $(COMMON_LIBS) $(CORBA_LIBS)
--- ./KERNEL_SRC_5.1.3/src/Utils/Test/Makefile.am~ 2009-12-01 15:58:41.000000000 +0100
+++ ./KERNEL_SRC_5.1.3/src/Utils/Test/Makefile.am 2010-12-20 13:07:19.658228991 +0100
@@ -82,5 +82,5 @@
bin_PROGRAMS = TestUtils
TestUtils_SOURCES = TestUtils.cxx
TestUtils_CPPFLAGS = $(COMMON_CPPFLAGS)
-TestUtils_LDADD = libUtilsTest.la $(CORBA_LIBS)
+TestUtils_LDADD = libUtilsTest.la $(COMMON_LIBS) $(CORBA_LIBS)
--- ./KERNEL_SRC_5.1.3/src/SALOMEDS/Makefile.am~ 2009-12-01 15:58:48.000000000 +0100
+++ ./KERNEL_SRC_5.1.3/src/SALOMEDS/Makefile.am 2010-12-20 12:56:35.778228999 +0100
@@ -286,13 +286,11 @@
SALOMEDS_Server_SOURCES = SALOMEDS_Server.cxx
SALOMEDS_Server_CPPFLAGS = $(COMMON_CPPFLAGS)
SALOMEDS_Server_LDADD = libSalomeDS.la \
- ../Basics/libSALOMEBasics.la \
- $(HDF5_LIBS) \
+ $(COMMON_LIBS) \
$(CORBA_LIBS)
SALOMEDS_Client_SOURCES = SALOMEDS_Client.cxx
SALOMEDS_Client_CPPFLAGS = $(COMMON_CPPFLAGS)
SALOMEDS_Client_LDADD = libSalomeDS.la \
- ../Basics/libSALOMEBasics.la \
- $(HDF5_LIBS) \
+ $(COMMON_LIBS) \
$(CORBA_LIBS)
--- ./KERNEL_SRC_5.1.3/src/SALOMEDS/Test/Makefile.am~ 2009-12-01 15:58:47.000000000 +0100
+++ ./KERNEL_SRC_5.1.3/src/SALOMEDS/Test/Makefile.am 2010-12-20 13:16:04.618228580 +0100
@@ -144,4 +144,5 @@
TestSALOMEDS_CPPFLAGS = $(COMMON_CPPFLAGS)
TestSALOMEDS_LDADD = libSALOMEDSTest.la \
$(RPATH)/Basics/libSALOMEBasics.la \
+ $(COMMON_LIBS) \
$(CORBA_LIBS)
--- ./KERNEL_SRC_5.1.3/src/LifeCycleCORBA/Test/Makefile.am~ 2009-12-01 15:58:41.000000000 +0100
+++ ./KERNEL_SRC_5.1.3/src/LifeCycleCORBA/Test/Makefile.am 2010-12-20 13:12:44.858223613 +0100
@@ -97,5 +97,5 @@
TestLifeCycleCORBA_LDADD = \
libLifeCycleCORBATest.la ../libSalomeLifeCycleCORBA.la \
$(RPATH)/NamingService/Test/libNamingServiceTest.la \
- $(COMMON_LIBS)
+ $(COMMON_LIBS) $(CORBA_LIBS)
--- ./KERNEL_SRC_5.1.3/src/ModuleCatalog/Makefile.am~ 2009-12-01 15:58:48.000000000 +0100
+++ ./KERNEL_SRC_5.1.3/src/ModuleCatalog/Makefile.am 2010-12-20 12:30:43.708228715 +0100
@@ -101,6 +101,7 @@
SALOME_ModuleCatalog_Server_LDADD =\
libSalomeCatalog.la \
+ $(COMMON_LIBS) \
@CORBA_LIBS@
# SALOME_ModuleCatalog_Client
@@ -110,4 +111,5 @@
SALOME_ModuleCatalog_Client_LDADD =\
libSalomeCatalog.la \
+ $(COMMON_LIBS) \
@CORBA_LIBS@
--- ./KERNEL_SRC_5.1.3/src/DSC/DSC_Basic/Makefile.am~ 2009-12-01 15:58:41.000000000 +0100
+++ ./KERNEL_SRC_5.1.3/src/DSC/DSC_Basic/Makefile.am 2010-12-20 12:58:56.048228991 +0100
@@ -88,4 +88,4 @@
SALOME_ConnectionManagerServer_LDADD = $(top_builddir)/idl/libSalomeIDLKernel.la \
$(top_builddir)/src/NamingService/libSalomeNS.la \
- $(top_builddir)/src/SALOMELocalTrace/libSALOMELocalTrace.la
+ $(top_builddir)/src/SALOMELocalTrace/libSALOMELocalTrace.la $(COMMON_LIBS)
--- ./KERNEL_SRC_5.1.3/src/NamingService/Test/Makefile.am~ 2009-12-01 15:58:42.000000000 +0100
+++ ./KERNEL_SRC_5.1.3/src/NamingService/Test/Makefile.am 2010-12-20 13:10:53.428229953 +0100
@@ -95,4 +95,6 @@
$(RPATH)/SALOMETraceCollector/Test/libSALOMETraceCollectorTest.la \
$(RPATH)/Utils/Test/libUtilsTest.la $(RPATH)/Utils/libOpUtil.la \
$(RPATH)/Basics/libSALOMEBasics.la \
- $(top_builddir)/idl/libSalomeIDLKernel.la
+ $(top_builddir)/idl/libSalomeIDLKernel.la \
+ $(CPPUNIT_LIBS) \
+ $(CORBA_LIBS)
--- ./KERNEL_SRC_5.1.3/src/MPIContainer/Makefile.am~ 2009-12-01 15:58:41.000000000 +0100
+++ ./KERNEL_SRC_5.1.3/src/MPIContainer/Makefile.am 2010-12-20 13:02:29.028229896 +0100
@@ -96,7 +96,7 @@
#
bin_PROGRAMS = SALOME_MPIContainer
SALOME_MPIContainer_SOURCES = SALOME_MPIContainer.cxx
-SALOME_MPIContainer_LDADD = libSalomeMPIContainer.la @PYTHON_LIBS@ @MPI_LIBS@
+SALOME_MPIContainer_LDADD = libSalomeMPIContainer.la $(COMMON_LIBS) @PYTHON_LIBS@ @MPI_LIBS@
SALOME_MPIContainer_CPPFLAGS = $(COMMON_CPPFLAGS)
