diff options
| author | David Tardon <dtardon@redhat.com> | 2012-04-13 07:03:15 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-04-13 10:27:10 +0200 |
| commit | 0a4ef4652564c5f2adf01c8d67c916a789f12dc8 (patch) | |
| tree | 91b412322f1ad17ece95fd46c1b24373be82239c /redland/rasqal | |
| parent | 574fcec8cd287c868b582bc9a4e5087f6e27d83c (diff) | |
rhbz#809466 change soname of bundled redland libs
Diffstat (limited to 'redland/rasqal')
| -rw-r--r-- | redland/rasqal/makefile.mk | 7 | ||||
| -rw-r--r-- | redland/rasqal/rasqal-0.9.16.patch.bundled-soname | 11 | ||||
| -rw-r--r-- | redland/rasqal/rasqal-0.9.16.patch.mingw | 4 |
3 files changed, 17 insertions, 5 deletions
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 = \ |