[PATCH 1/2] openjade: Fix build if not installing the libtool-garbage

[Ross Burton <ross.burton@intel.com>]

From: Phil Blundell <philb@brightsign.biz>

The openjade build system is slightly funky and does strange things with
library dependencies.  Fix it up so that it depends on the .so rather than
the .la (which may not exist) for libraries from the sysroot.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../openjade/openjade-1.3.2/no-libtool.patch         | 20 ++++++++++++++++++++
 .../openjade/openjade-native_1.3.2.bb                |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 meta/recipes-devtools/openjade/openjade-1.3.2/no-libtool.patch

diff --git a/meta/recipes-devtools/openjade/openjade-1.3.2/no-libtool.patch b/meta/recipes-devtools/openjade/openjade-1.3.2/no-libtool.patch
new file mode 100644
index 0000000..8642bfd
--- /dev/null
+++ b/meta/recipes-devtools/openjade/openjade-1.3.2/no-libtool.patch
@@ -0,0 +1,20 @@
+The openjade build is fairly unique in auto-generating explicit dependencies to
+installed .la files.  As some distributions may delete these files unless
+clearly required, change the Makefile fragment to depend on the .so instead.
+
+Patch originally by Phil Blundell <philb@brightsign.biz>.
+
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+Upstream-Status: Inappropriate
+
+--- openjade-1.3.2/Makefile.prog.in~	2013-05-14 11:42:02.646782318 +0100
++++ openjade-1.3.2/Makefile.prog.in	2013-05-14 11:54:55.051728343 +0100
+@@ -12,7 +12,7 @@
+ 
+ ALL_LIBS = $(XLIBS) $(LIBS)
+ Makefile.lt:
+-	echo 'LT_LIBS='`echo $(ALL_LIBS)|sed 's/\.a/.la/g'` >Makefile.lt
++	echo 'LT_LIBS='`for d in $(ALL_LIBS); do case $$d in ../*) echo $$d | sed 's/\.a/.la/g' ;; *) echo $$d | sed 's/\.a/.so/g' ;; esac ; done` >Makefile.lt
+ 
+ PROG:=$(shell echo "$(PROG)" | sed '@program_transform_name@')
+ 
diff --git a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
index a304daa..068fdf0 100644
--- a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
+++ b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
@@ -16,6 +16,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/openjade-${PV}.tar.gz \
            file://makefile.patch \
            file://msggen.pl.patch \
            file://reautoconf.patch \
+	   file://no-libtool.patch \
 	   file://user-declared-default-constructor.patch \
            file://fix-regex.patch"
 
-- 
2.6.4