From 0a4ef4652564c5f2adf01c8d67c916a789f12dc8 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 13 Apr 2012 07:03:15 +0200 Subject: rhbz#809466 change soname of bundled redland libs --- redland/prj/d.lst | 24 +++++++++++----------- redland/raptor/makefile.mk | 7 ++++--- redland/raptor/raptor-1.4.18.patch.bundled-soname | 11 ++++++++++ redland/raptor/raptor-1.4.18.patch.mingw | 4 ++-- redland/rasqal/makefile.mk | 7 ++++--- redland/rasqal/rasqal-0.9.16.patch.bundled-soname | 11 ++++++++++ redland/rasqal/rasqal-0.9.16.patch.mingw | 4 ++-- redland/redland/makefile.mk | 7 ++++--- redland/redland/redland-1.0.8.patch.bundled-soname | 11 ++++++++++ redland/redland/redland-1.0.8.patch.mingw | 4 ++-- scp2/source/ooo/file_library_ooo.scp | 24 +++++++++++----------- 11 files changed, 75 insertions(+), 39 deletions(-) create mode 100644 redland/raptor/raptor-1.4.18.patch.bundled-soname create mode 100644 redland/rasqal/rasqal-0.9.16.patch.bundled-soname create mode 100644 redland/redland/redland-1.0.8.patch.bundled-soname diff --git a/redland/prj/d.lst b/redland/prj/d.lst index 5715417f7a1e..39b7afaf8066 100644 --- a/redland/prj/d.lst +++ b/redland/prj/d.lst @@ -1,20 +1,20 @@ mkdir: %_DEST%\inc\external ..\%__SRC%\inc\*.h %_DEST%\inc\external\*.h -..\%__SRC%\lib\libraptor.so.1 %_DEST%\lib\libraptor.so.1 -symlink: %_DEST%\lib\libraptor.so.1 %_DEST%\lib\libraptor.so +..\%__SRC%\lib\libraptor-lo.so.1 %_DEST%\lib\libraptor-lo.so.1 +symlink: %_DEST%\lib\libraptor-lo.so.1 %_DEST%\lib\libraptor.so ..\%__SRC%\lib\libraptor.so %_DEST%\lib\libraptor.so -..\%__SRC%\lib\libraptor.1.dylib %_DEST%\lib\libraptor.1.dylib -symlink: %_DEST%\lib\libraptor.1.dylib %_DEST%\lib\libraptor.dylib -..\%__SRC%\lib\librasqal.so.1 %_DEST%\lib\librasqal.so.1 -symlink: %_DEST%\lib\librasqal.so.1 %_DEST%\lib\librasqal.so +..\%__SRC%\lib\libraptor-lo.1.dylib %_DEST%\lib\libraptor-lo.1.dylib +symlink: %_DEST%\lib\libraptor-lo.1.dylib %_DEST%\lib\libraptor.dylib +..\%__SRC%\lib\librasqal-lo.so.1 %_DEST%\lib\librasqal-lo.so.1 +symlink: %_DEST%\lib\librasqal-lo.so.1 %_DEST%\lib\librasqal.so ..\%__SRC%\lib\librasqal.so %_DEST%\lib\librasqal.so -..\%__SRC%\lib\librasqal.1.dylib %_DEST%\lib\librasqal.1.dylib -symlink: %_DEST%\lib\librasqal.1.dylib %_DEST%\lib\librasqal.dylib -..\%__SRC%\lib\librdf.so.0 %_DEST%\lib\librdf.so.0 -symlink: %_DEST%\lib\librdf.so.0 %_DEST%\lib\librdf.so +..\%__SRC%\lib\librasqal-lo.1.dylib %_DEST%\lib\librasqal-lo.1.dylib +symlink: %_DEST%\lib\librasqal-lo.1.dylib %_DEST%\lib\librasqal.dylib +..\%__SRC%\lib\librdf-lo.so.0 %_DEST%\lib\librdf-lo.so.0 +symlink: %_DEST%\lib\librdf-lo.so.0 %_DEST%\lib\librdf.so ..\%__SRC%\lib\librdf.so %_DEST%\lib\librdf.so -..\%__SRC%\lib\librdf.0.dylib %_DEST%\lib\librdf.0.dylib -symlink: %_DEST%\lib\librdf.0.dylib %_DEST%\lib\librdf.dylib +..\%__SRC%\lib\librdf-lo.0.dylib %_DEST%\lib\librdf-lo.0.dylib +symlink: %_DEST%\lib\librdf-lo.0.dylib %_DEST%\lib\librdf.dylib ..\%__SRC%\lib\*.lib %_DEST%\lib ..\%__SRC%\lib\*.a %_DEST%\lib ..\%__SRC%\lib\lib*.dll.a %_DEST%\lib\lib*.a diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index 54a46ab386ca..dacdfac9a365 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -59,7 +59,8 @@ OOO_PATCH_FILES= \ $(TARFILE_NAME).patch.win32 \ $(TARFILE_NAME).patch.rindex \ raptor-aix.patch \ - $(TARFILE_NAME).entities.patch + $(TARFILE_NAME).entities.patch \ + $(TARFILE_NAME).patch.bundled-soname .IF "$(CROSS_COMPILING)"=="YES" OOO_PATCH_FILES += \ @@ -204,7 +205,7 @@ OUT2BIN+=src/raptor-config OUT2LIB+=src$/.libs$/libraptor.so OUT2BIN+=src/raptor-config .ELIF "$(OS)"=="AIX" -OUT2LIB+=src$/.libs$/libraptor.so.$(RAPTOR_MAJOR) src$/.libs$/libraptor.so +OUT2LIB+=src$/.libs$/libraptor-lo.so.$(RAPTOR_MAJOR) src$/.libs$/libraptor.so OUT2BIN+=src/raptor-config .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" @@ -215,7 +216,7 @@ OUT2BIN+=src/raptor-config # if we use dmake, this is done automagically .ENDIF .ELSE -OUT2LIB+=src$/.libs$/libraptor.so.$(RAPTOR_MAJOR) src$/.libs$/libraptor.so +OUT2LIB+=src$/.libs$/libraptor-lo.so.$(RAPTOR_MAJOR) src$/.libs$/libraptor.so OUT2BIN+=src/raptor-config .ENDIF diff --git a/redland/raptor/raptor-1.4.18.patch.bundled-soname b/redland/raptor/raptor-1.4.18.patch.bundled-soname new file mode 100644 index 000000000000..cd8e87e2037f --- /dev/null +++ b/redland/raptor/raptor-1.4.18.patch.bundled-soname @@ -0,0 +1,11 @@ +--- misc/raptor-1.4.18/src/Makefile.in ++++ misc/build/raptor-1.4.18/src/Makefile.in +@@ -404,7 +404,7 @@ + $(am__append_20) $(am__append_21) $(am__append_22) \ + $(am__append_23) $(am__append_24) $(am__append_25) \ + $(am__append_26) +-libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ ++libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ -release lo + libraptor_la_LIBADD = @LTLIBOBJS@ + EXTRA_DIST = \ + raptor-config.in \ diff --git a/redland/raptor/raptor-1.4.18.patch.mingw b/redland/raptor/raptor-1.4.18.patch.mingw index bb9f6f4eff48..b671e4db141e 100644 --- a/redland/raptor/raptor-1.4.18.patch.mingw +++ b/redland/raptor/raptor-1.4.18.patch.mingw @@ -34,8 +34,8 @@ $(am__append_20) $(am__append_21) $(am__append_22) \ $(am__append_23) $(am__append_24) $(am__append_25) \ $(am__append_26) --libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ -+libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ -no-undefined +-libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ -release lo ++libraptor_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ -release lo -no-undefined libraptor_la_LIBADD = @LTLIBOBJS@ EXTRA_DIST = \ raptor-config.in \ diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index dabaf78c7add..764993cc9475 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -57,7 +57,8 @@ OOO_PATCH_FILES= \ $(TARFILE_NAME).patch.ooo_build \ $(TARFILE_NAME).patch.dmake \ $(TARFILE_NAME).patch.win32 \ - rasqal-aix.patch + rasqal-aix.patch \ + $(TARFILE_NAME).patch.bundled-soname PATCH_FILES=$(OOO_PATCH_FILES) @@ -156,7 +157,7 @@ BUILD_DIR=$(CONFIGURE_DIR) OUT2INC+=src$/rasqal.h .IF "$(OS)"=="MACOSX" -OUT2LIB+=src$/.libs$/librasqal.$(RASQAL_MAJOR).dylib src$/.libs$/librasqal.dylib +OUT2LIB+=src$/.libs$/librasqal-lo.$(RASQAL_MAJOR).dylib src$/.libs$/librasqal.dylib OUT2BIN+=src/rasqal-config .ELIF "$(OS)"=="IOS" OUT2LIB+=src$/.libs$/librasqal.a @@ -173,7 +174,7 @@ OUT2BIN+=src/rasqal-config # if we use dmake, this is done automagically .ENDIF .ELSE -OUT2LIB+=src$/.libs$/librasqal.so.$(RASQAL_MAJOR) src$/.libs$/librasqal.so +OUT2LIB+=src$/.libs$/librasqal-lo.so.$(RASQAL_MAJOR) src$/.libs$/librasqal.so OUT2BIN+=src/rasqal-config .ENDIF diff --git a/redland/rasqal/rasqal-0.9.16.patch.bundled-soname b/redland/rasqal/rasqal-0.9.16.patch.bundled-soname new file mode 100644 index 000000000000..5e5bea4378a0 --- /dev/null +++ b/redland/rasqal/rasqal-0.9.16.patch.bundled-soname @@ -0,0 +1,11 @@ +--- misc/rasqal-0.9.16/src/Makefile.in ++++ misc/build/rasqal-0.9.16/src/Makefile.in +@@ -355,7 +355,7 @@ + rasqal_xsd_datatypes.c rasqal_decimal.c rasqal_datetime.c \ + rasqal_rowsource.c rasqal_sparql_xml.c $(am__append_3) \ + $(am__append_4) $(am__append_5) +-librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@ ++librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@ -release lo + librasqal_la_LIBADD = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@ @RASQAL_EXTERNAL_LIBS@ $(MEM_LIBS) + librasqal_la_DEPENDENCIES = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@ + EXTRA_DIST = \ diff --git a/redland/rasqal/rasqal-0.9.16.patch.mingw b/redland/rasqal/rasqal-0.9.16.patch.mingw index 9c42a986b1d0..459ed46cb15d 100644 --- a/redland/rasqal/rasqal-0.9.16.patch.mingw +++ b/redland/rasqal/rasqal-0.9.16.patch.mingw @@ -4,8 +4,8 @@ rasqal_xsd_datatypes.c rasqal_decimal.c rasqal_datetime.c \ rasqal_rowsource.c rasqal_sparql_xml.c $(am__append_3) \ $(am__append_4) $(am__append_5) --librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@ -+librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@ -no-undefined +-librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@ -release lo ++librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@ -release lo -no-undefined librasqal_la_LIBADD = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@ @RASQAL_EXTERNAL_LIBS@ $(MEM_LIBS) librasqal_la_DEPENDENCIES = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@ EXTRA_DIST = \ diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index 1eeeba0257ef..cf7639f987db 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -57,7 +57,8 @@ OOO_PATCH_FILES= \ $(TARFILE_NAME).patch.dmake \ $(TARFILE_NAME).patch.ooo_build \ $(TARFILE_NAME).patch.win32 \ - redland-aix.patch + redland-aix.patch \ + $(TARFILE_NAME).patch.bundled-soname PATCH_FILES=$(OOO_PATCH_FILES) \ @@ -163,7 +164,7 @@ BUILD_DIR=$(CONFIGURE_DIR) OUT2INC+=librdf$/*.h .IF "$(OS)"=="MACOSX" -OUT2LIB+=librdf$/.libs$/librdf.$(REDLAND_MAJOR).dylib +OUT2LIB+=librdf$/.libs$/librdf-lo.$(REDLAND_MAJOR).dylib .ELIF "$(OS)"=="IOS" OUT2LIB+=librdf$/.libs$/librdf.a .ELIF "$(OS)"=="ANDROID" @@ -176,7 +177,7 @@ OUT2BIN+=librdf$/.libs$/*.dll # if we use dmake, this is done automagically .ENDIF .ELSE -OUT2LIB+=librdf$/.libs$/librdf.so.$(REDLAND_MAJOR) +OUT2LIB+=librdf$/.libs$/librdf-lo.so.$(REDLAND_MAJOR) .ENDIF # --- Targets ------------------------------------------------------ diff --git a/redland/redland/redland-1.0.8.patch.bundled-soname b/redland/redland/redland-1.0.8.patch.bundled-soname new file mode 100644 index 000000000000..68c9dfed19d2 --- /dev/null +++ b/redland/redland/redland-1.0.8.patch.bundled-soname @@ -0,0 +1,11 @@ +--- misc/redland-1.0.8/librdf/Makefile.in ++++ misc/build/redland-1.0.8/librdf/Makefile.in +@@ -463,7 +463,7 @@ + rdf_parser_raptor.c + + EXTRA_DIST = redland.spec redland.spec.in mysql-v1.ttl mysql-v2.ttl +-librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ \ ++librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ -release lo \ + @LIBRDF_LDFLAGS@ @LIBRDF_EXTERNAL_LIBS@ $(MEM_LIBS) + + pkgdata_DATA = $(am__append_11) diff --git a/redland/redland/redland-1.0.8.patch.mingw b/redland/redland/redland-1.0.8.patch.mingw index a32621b51acc..aeddac89c695 100644 --- a/redland/redland/redland-1.0.8.patch.mingw +++ b/redland/redland/redland-1.0.8.patch.mingw @@ -4,8 +4,8 @@ rdf_parser_raptor.c EXTRA_DIST = redland.spec redland.spec.in mysql-v1.ttl mysql-v2.ttl --librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ \ -+librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ -no-undefined \ +-librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ -release lo \ ++librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ -release lo -no-undefined \ @LIBRDF_LDFLAGS@ @LIBRDF_EXTERNAL_LIBS@ $(MEM_LIBS) pkgdata_DATA = $(am__append_11) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 50562f3d970d..66735681da4d 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1567,15 +1567,15 @@ File gid_File_Lib_Raptor Dir = SCP2_OOO_BIN_DIR; #ifdef UNX #ifdef MACOSX - Name = STRING(CONCAT4(libraptor,.,RAPTOR_MAJOR,UNXSUFFIX)); + Name = STRING(CONCAT4(libraptor-lo,.,RAPTOR_MAJOR,UNXSUFFIX)); #else - Name = STRING(CONCAT4(libraptor,UNXSUFFIX,.,RAPTOR_MAJOR)); + Name = STRING(CONCAT4(libraptor-lo,UNXSUFFIX,.,RAPTOR_MAJOR)); #endif #else #ifdef _gcc3 - Name = "libraptor-1.dll"; + Name = "libraptor-lo-1.dll"; #else - Name = "raptor.dll"; + Name = "raptor-lo.dll"; #endif #endif End @@ -1586,15 +1586,15 @@ File gid_File_Lib_Rasqal Dir = SCP2_OOO_BIN_DIR; #ifdef UNX #ifdef MACOSX - Name = STRING(CONCAT4(librasqal,.,RASQAL_MAJOR,UNXSUFFIX)); + Name = STRING(CONCAT4(librasqal-lo,.,RASQAL_MAJOR,UNXSUFFIX)); #else - Name = STRING(CONCAT4(librasqal,UNXSUFFIX,.,RASQAL_MAJOR)); + Name = STRING(CONCAT4(librasqal-lo,UNXSUFFIX,.,RASQAL_MAJOR)); #endif #else #ifdef _gcc3 - Name = STRING(CONCAT3(librasqal-,RASQAL_MAJOR,.dll)); + Name = STRING(CONCAT3(librasqal-lo-,RASQAL_MAJOR,.dll)); #else - Name = "rasqal.dll"; + Name = "rasqal-lo.dll"; #endif #endif End @@ -1605,15 +1605,15 @@ File gid_File_Lib_Rdf Dir = SCP2_OOO_BIN_DIR; #ifdef UNX #ifdef MACOSX - Name = STRING(CONCAT4(librdf,.,REDLAND_MAJOR,UNXSUFFIX)); + Name = STRING(CONCAT4(librdf-lo,.,REDLAND_MAJOR,UNXSUFFIX)); #else - Name = STRING(CONCAT4(librdf,UNXSUFFIX,.,REDLAND_MAJOR)); + Name = STRING(CONCAT4(librdf-lo,UNXSUFFIX,.,REDLAND_MAJOR)); #endif #else #ifdef _gcc3 - Name = "librdf-0.dll"; + Name = "librdf-lo-0.dll"; #else - Name = "librdf.dll"; + Name = "librdf-lo.dll"; #endif #endif End -- cgit