From d48d265d3d65e227a907e5a3ce66c39a4ab4ecc9 Mon Sep 17 00:00:00 2001 From: Richard Leitner Date: Tue, 17 Jul 2018 16:08:42 +0200 Subject: libmxml: update to current git master (ba3cca8) Update the Mini-XML library to a 2.12 pre-release version which integrates the needed patches for OE. Therefore remove those patches from here. Furthermore avoid using autoheader as suggested by mxml's author: https://github.com/michaelrsweet/mxml/pull/223 Signed-off-by: Richard Leitner Signed-off-by: Khem Raj --- ...ove-rpath-from-configure.in-and-configure.patch | 55 ---------------------- 1 file changed, 55 deletions(-) delete mode 100644 meta-oe/recipes-support/libmxml/libmxml/0001-remove-rpath-from-configure.in-and-configure.patch (limited to 'meta-oe/recipes-support/libmxml/libmxml/0001-remove-rpath-from-configure.in-and-configure.patch') diff --git a/meta-oe/recipes-support/libmxml/libmxml/0001-remove-rpath-from-configure.in-and-configure.patch b/meta-oe/recipes-support/libmxml/libmxml/0001-remove-rpath-from-configure.in-and-configure.patch deleted file mode 100644 index cab203e7ff..0000000000 --- a/meta-oe/recipes-support/libmxml/libmxml/0001-remove-rpath-from-configure.in-and-configure.patch +++ /dev/null @@ -1,55 +0,0 @@ -From bcf5391c0c7edd85ee0c956be65cf4eeeea0a82a Mon Sep 17 00:00:00 2001 -From: Fathi Boudra -Date: Fri, 1 Jun 2018 14:16:52 +0200 -Subject: [PATCH 1/7] remove rpath from configure.in and configure - -This patch was taken from Debian's libmxml 2.11-1 source: - 01_remove_rpath.diff ---- - configure.ac | 11 ++++------- - 1 file changed, 4 insertions(+), 7 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 47a0d41..6b3bbfa 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -184,8 +184,7 @@ if test x$enable_shared != xno; then - AC_MSG_RESULT(yes) - LIBMXML="libmxml.so.1.6" - DSO="\$(CC)" -- DSOFLAGS="$DSOFLAGS -Wl,-h,libmxml.so.1 -G -R\$(libdir) \$(OPTIM)" -- LDFLAGS="$LDFLAGS -R\$(libdir)" -+ DSOFLAGS="$DSOFLAGS -Wl,-h,libmxml.so.1 -G \$(OPTIM)" - ;; - - hp-ux) -@@ -200,23 +199,21 @@ if test x$enable_shared != xno; then - AC_MSG_RESULT(yes) - LIBMXML="libmxml.so.1.6" - DSO="\$(CC)" -- DSOFLAGS="$DSOFLAGS -Wl,-rpath,\$(libdir),-set_version,sgi1.0,-soname,libmxml.so.1 -shared \$(OPTIM)" -+ DSOFLAGS="$DSOFLAGS -Wl,-set_version,sgi1.0,-soname,libmxml.so.1 -shared \$(OPTIM)" - ;; - - osf | linux* | gnu) - AC_MSG_RESULT(yes) - LIBMXML="libmxml.so.1.6" - DSO="\$(CC)" -- DSOFLAGS="$DSOFLAGS -Wl,-soname,libmxml.so.1,-rpath,\$(libdir) -shared \$(OPTIM)" -- LDFLAGS="$LDFLAGS -Wl,-rpath,\$(libdir)" -+ DSOFLAGS="$DSOFLAGS -Wl,-soname,libmxml.so.1 -shared \$(OPTIM)" - ;; - - *bsd) - AC_MSG_RESULT(yes) - LIBMXML="libmxml.so.1.6" - DSO="\$(CC)" -- DSOFLAGS="$DSOFLAGS -Wl,-soname,libmxml.so.1,-R\$(libdir) -shared \$(OPTIM)" -- LDFLAGS="$LDFLAGS -Wl,-R\$(libdir)" -+ DSOFLAGS="$DSOFLAGS -Wl,-soname,libmxml.so.1 -shared \$(OPTIM)" - ;; - - darwin) --- -2.11.0 - -- cgit 1.2.3-korg