diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-12-07 18:19:10 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-12-07 18:19:10 +0100 |
| commit | 96fddf9ff7852b117d81d265bc31c9ac62f639b6 (patch) | |
| tree | 04411132ee1ae85a772d0f4cdffc8a2228d33a65 | |
| parent | 38a0ac25f0188b74637afe769b6eb16900a26bfa (diff) | |
| download | ptxdist-96fddf9ff7852b117d81d265bc31c9ac62f639b6.tar.gz ptxdist-96fddf9ff7852b117d81d265bc31c9ac62f639b6.tar.xz | |
xmlrpc-c: fix building with newer toolchains
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/xmlrpc-c-1.06.42/0007-link-all-libraries-correctly-to-avoid-undefined-refe.patch | 58 | ||||
| -rw-r--r-- | patches/xmlrpc-c-1.06.42/series | 3 |
2 files changed, 60 insertions, 1 deletions
diff --git a/patches/xmlrpc-c-1.06.42/0007-link-all-libraries-correctly-to-avoid-undefined-refe.patch b/patches/xmlrpc-c-1.06.42/0007-link-all-libraries-correctly-to-avoid-undefined-refe.patch new file mode 100644 index 000000000..7ec16aacf --- /dev/null +++ b/patches/xmlrpc-c-1.06.42/0007-link-all-libraries-correctly-to-avoid-undefined-refe.patch @@ -0,0 +1,58 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Fri, 7 Dec 2012 17:50:04 +0100 +Subject: [PATCH] link all libraries correctly to avoid undefined references + with newer toolchains + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + lib/expat/xmlparse/Makefile | 4 +++- + src/Makefile | 6 +++++- + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/lib/expat/xmlparse/Makefile b/lib/expat/xmlparse/Makefile +index 96c0be8..572270d 100644 +--- a/lib/expat/xmlparse/Makefile ++++ b/lib/expat/xmlparse/Makefile +@@ -26,8 +26,10 @@ LDFLAGS = $(LADD) + + LIBLDFLAGS = $(LDFLAGS_VERSINFO) -rpath $(LIBINST_DIR) $(LADD) + ++LIBXMLRPC_XMLPARSE_LIBDEP = -lxmlrpc_xmltok -L../xmltok/.libs ++ + libxmlrpc_xmlparse.la: $(LIBXMLRPC_XMLPARSE_OBJS) +- $(LIBTOOL) --mode=link $(CCLD) -o $@ $(LIBLDFLAGS) $^ ++ $(LIBTOOL) --mode=link $(CCLD) -o $@ $(LIBLDFLAGS) $(LIBXMLRPC_XMLPARSE_LIBDEP) $^ + + CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_PERSONAL) $(CADD) + +diff --git a/src/Makefile b/src/Makefile +index e78370d..18e2033 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -9,6 +9,7 @@ include $(BUILDDIR)/Makefile.config + + ABYSS_LIBDIR = $(BUILDDIR)/lib/abyss/src/.libs + LIBUTIL_LIBDIR = $(BUILDDIR)/lib/libutil/.libs ++LIBXMLPARSE_LIBDIR = $(BUILDDIR)/lib/expat/xmlparse/.libs + + default: all + +@@ -97,6 +98,9 @@ LIBXMLRPC_OBJS = \ + xmlrpc_authcookie.lo \ + + LIBXMLRPC_LIBDEP = -lxmlrpc_util $(LIBXML_LIBS) ++ifneq ($(ENABLE_LIBXML2_BACKEND),yes) ++LIBXMLRPC_LIBDEP += -lxmlrpc_xmlparse ++endif + + LIB_OBJS = $(LIBXMLRPC_CLIENT_OBJS) $(LIBXMLRPC_SERVER_OBJS) + +@@ -133,7 +137,7 @@ all: $(TARGET_LTLIBRARIES) $(SUBDIRS:%=%/all) + + LDFLAGS = $(LADD) + +-LIBPATHS = -L.libs -L$(LIBUTIL_LIBDIR) ++LIBPATHS = -L.libs -L$(LIBUTIL_LIBDIR) -L$(LIBXMLPARSE_LIBDIR) + + LIBLDFLAGS = $(LDFLAGS_VERSINFO) -rpath $(LIBINST_DIR) $(LIBPATHS) $(LADD) + diff --git a/patches/xmlrpc-c-1.06.42/series b/patches/xmlrpc-c-1.06.42/series index 94b776866..75123f6fa 100644 --- a/patches/xmlrpc-c-1.06.42/series +++ b/patches/xmlrpc-c-1.06.42/series @@ -6,4 +6,5 @@ 0004-xmlrpc-c-config.in-add-SYSROOT-support.patch 0005-calling-AC_PROG_CXX-conditionally-is-broken-with-aut.patch 0006-fix-building-with-libcurl-7.26.0.patch -# 836dbd8535e2c51912651afb2ece2608 - git-ptx-patches magic +0007-link-all-libraries-correctly-to-avoid-undefined-refe.patch +# c9011b8fd7100d32e783121ec53f22bc - git-ptx-patches magic |