[11/18] expat: Fix potential issues with darwin/windows

Submitted by Yann Diorcet on Aug. 6, 2014, 7:17 p.m.

Details

Message ID 1407352684-7837-11-git-send-email-diorcet.yann@gmail.com
State Under Review
Delegated to: Kim
Headers show

Commit Message

Yann Diorcet Aug. 6, 2014, 7:17 p.m.
---
 recipes/expat/expat-2.0.1/cdpath.patch         | 10 ++++++++++
 recipes/expat/expat-2.0.1/libtool-bindir.patch | 11 +++++++++++
 recipes/expat/expat.inc                        |  2 +-
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 recipes/expat/expat-2.0.1/cdpath.patch
 create mode 100644 recipes/expat/expat-2.0.1/libtool-bindir.patch

Patch hide | download patch | download mbox

diff --git a/recipes/expat/expat-2.0.1/cdpath.patch b/recipes/expat/expat-2.0.1/cdpath.patch
new file mode 100644
index 0000000..3940e93
--- /dev/null
+++ b/recipes/expat/expat-2.0.1/cdpath.patch
@@ -0,0 +1,10 @@ 
+--- expat-2.0.1/configure.in~orig	2013-05-16 11:37:20.936981596 +0200
++++ expat-2.0.1/configure.in	2013-05-16 11:37:32.976981296 +0200
+@@ -31,6 +31,7 @@
+ 
+ AC_CONFIG_SRCDIR(Makefile.in)
+ AC_CONFIG_AUX_DIR(conftools)
++AC_CONFIG_MACRO_DIR(conftools)
+ 
+ 
+ dnl
diff --git a/recipes/expat/expat-2.0.1/libtool-bindir.patch b/recipes/expat/expat-2.0.1/libtool-bindir.patch
new file mode 100644
index 0000000..f48467e
--- /dev/null
+++ b/recipes/expat/expat-2.0.1/libtool-bindir.patch
@@ -0,0 +1,11 @@ 
+--- expat-2.0.1/Makefile.in~orig	2013-05-16 12:27:58.376905480 +0200
++++ expat-2.0.1/Makefile.in	2013-05-16 12:29:05.580903796 +0200
+@@ -117,7 +117,7 @@
+ COMPILE = $(CC) $(INCLUDES) $(CFLAGS) $(DEFS) $(CPPFLAGS)
+ CXXCOMPILE = $(CXX) $(INCLUDES) $(CXXFLAGS) $(DEFS) $(CPPFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
+-LINK_LIB = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -no-undefined $(VSNFLAG) -rpath $(libdir) $(LDFLAGS) -o $@
++LINK_LIB = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -no-undefined $(VSNFLAG) -rpath $(libdir) -bindir $(DESTDIR)$(bindir) $(LDFLAGS) -o $@
+ LINK_EXE = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LDFLAGS) -o $@
+ LINK_CXX_EXE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CXXCOMPILE) $(LDFLAGS) -o $@
+ 
diff --git a/recipes/expat/expat.inc b/recipes/expat/expat.inc
index 3c355d3..6544444 100644
--- a/recipes/expat/expat.inc
+++ b/recipes/expat/expat.inc
@@ -4,7 +4,7 @@  HOMEPAGE = "http://expat.sf.net/"
 
 RECIPE_TYPES = "machine native sdk"
 
-inherit autotools make-vpath
+inherit autotools-autoreconf make-vpath
 
 require conf/fetch/sourceforge.conf
 SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz"