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/raptor | |
| parent | 574fcec8cd287c868b582bc9a4e5087f6e27d83c (diff) | |
rhbz#809466 change soname of bundled redland libs
Diffstat (limited to 'redland/raptor')
| -rw-r--r-- | redland/raptor/makefile.mk | 7 | ||||
| -rw-r--r-- | redland/raptor/raptor-1.4.18.patch.bundled-soname | 11 | ||||
| -rw-r--r-- | redland/raptor/raptor-1.4.18.patch.mingw | 4 |
3 files changed, 17 insertions, 5 deletions
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 \ |