diff mbox

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

Message ID BD22328D0EB182418C2A0952DC2454F88086FE86@VMPREVAS2.prevas.se
State Not Applicable
Headers show

Commit Message

kim.hansen@prevas.dk Jan. 5, 2015, 2:55 p.m. UTC 
Hi Yann,

Is this fixing problems only for windows/darwin?

Could it be conditionally applied then?

/Kim
diff mbox

Patch

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"