From f3e1eeb9e37b18c0813f5b0b047fbd75803a8a0f Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Sun, 14 Feb 2010 21:59:14 +0000 Subject: [PATCH] - Fix DSO linking error RHBZ#564859 - Link to our own libltdl --- redland-1.0.10-linking.patch | 33 +++++++++++++++++++++++++++++++++ redland.spec | 15 +++++++++++++-- 2 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 redland-1.0.10-linking.patch diff --git a/redland-1.0.10-linking.patch b/redland-1.0.10-linking.patch new file mode 100644 index 0000000..a5c42de --- /dev/null +++ b/redland-1.0.10-linking.patch @@ -0,0 +1,33 @@ +diff -rupN redland-1.0.10.old/src/Makefile.in redland-1.0.10/src/Makefile.in +--- redland-1.0.10.old/src/Makefile.in 2009-12-14 01:53:52.000000000 -0500 ++++ redland-1.0.10/src/Makefile.in 2010-02-14 16:48:45.000000000 -0500 +@@ -1383,7 +1383,7 @@ rdf_concepts_test: rdf_concepts.c librdf + $(COMPILE_LINK) -DSTANDALONE $(srcdir)/rdf_concepts.c librdf.la + + rdf_query_test: rdf_query.c rdf_query_results.c librdf.la +- $(COMPILE_LINK) -DSTANDALONE $(srcdir)/rdf_query.c $(srcdir)/rdf_query_results.c librdf.la ++ $(COMPILE_LINK) -lraptor -lrasqal -DSTANDALONE $(srcdir)/rdf_query.c $(srcdir)/rdf_query_results.c librdf.la + + rdf_serializer_test: rdf_serializer.c librdf.la + $(COMPILE_LINK) -DSTANDALONE $(srcdir)/rdf_serializer.c librdf.la +diff -rupN redland-1.0.10.old/utils/Makefile.in redland-1.0.10/utils/Makefile.in +--- redland-1.0.10.old/utils/Makefile.in 2009-12-14 01:53:52.000000000 -0500 ++++ redland-1.0.10/utils/Makefile.in 2010-02-14 16:44:20.000000000 -0500 +@@ -68,7 +68,7 @@ am__rdfproc_SOURCES_DIST = rdfproc.c get + @GETOPT_TRUE@am__objects_1 = getopt.$(OBJEXT) + am_rdfproc_OBJECTS = rdfproc.$(OBJEXT) $(am__objects_1) + rdfproc_OBJECTS = $(am_rdfproc_OBJECTS) +-rdfproc_LDADD = $(LDADD) ++rdfproc_LDADD = -lraptor -lrasqal $(LDADD) + rdfproc_DEPENDENCIES = $(top_builddir)/src/librdf.la + am_redland_db_upgrade_OBJECTS = db_upgrade.$(OBJEXT) + redland_db_upgrade_OBJECTS = $(am_redland_db_upgrade_OBJECTS) +@@ -317,7 +317,7 @@ LDADD = $(top_builddir)/src/librdf.la + AM_LDFLAGS = @LIBRDF_LDFLAGS@ + redland_db_upgrade_SOURCES = db_upgrade.c + redland_virtuoso_test_SOURCES = redland-virtuoso-test.c +-redland_virtuoso_test_LDADD = @LIBRDF_LDFLAGS@ $(top_builddir)/src/librdf.la ++redland_virtuoso_test_LDADD = -lraptor @LIBRDF_LDFLAGS@ $(top_builddir)/src/librdf.la + rdfproc_SOURCES = rdfproc.c $(am__append_1) + all: all-am + diff --git a/redland.spec b/redland.spec index d55bfa4..896e3d9 100644 --- a/redland.spec +++ b/redland.spec @@ -1,6 +1,6 @@ Name: redland Version: 1.0.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: RDF Application Framework Group: System Environment/Libraries @@ -11,10 +11,15 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch50: redland-1.0.10-pkgconfig_requires_private.patch Patch51: redland-1.0.10-no_undefined.patch +# Fix DSO linking. Upstream is informed and will most likely do a more +# portable fix than this simple hack in their trunk +# http://bugs.librdf.org/mantis/view.php?id=348 +Patch60: redland-1.0.10-linking.patch BuildRequires: curl-devel BuildRequires: db4-devel BuildRequires: libiodbc-devel +BuildRequires: libtool-ltdl-devel BuildRequires: libxml2-devel >= 2.4.0 BuildRequires: mysql-devel BuildRequires: postgresql-devel @@ -47,6 +52,7 @@ Header files for development with Redland. %patch50 -p1 -b .pkgconfig_requires_private %patch51 -p1 -b .no_undefined +%patch60 -p1 -b .dso_linking # hack to nuke rpaths %if "%{_libdir}" != "/usr/lib" @@ -56,7 +62,8 @@ sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure %build %configure \ --enable-release \ - --disable-static + --disable-static \ + --with-included-ltdl=no make %{?_smp_mflags} @@ -118,6 +125,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Feb 13 2010 Orcan Ogetbil - 1.0.10-4 +- Fix DSO linking error RHBZ#564859 +- Link to our own libltdl + * Mon Jan 04 2010 Rex Dieter - 1.0.10-3 - no_undefined patch