From 3eb6135d8958037b4e81c7ab034d9be2e5c20899 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Tue, 14 May 2013 11:59:37 +0100 Subject: openjade: Fix build if not installing libtool .la files 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. (From OE-Core rev: dd6998ee068f0edf20139fee80fbbf6c1347649d) Signed-off-by: Phil Blundell Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../openjade/openjade-1.3.2/no-libtool.patch | 20 ++++++++++++++++++++ .../openjade/openjade-native_1.3.2.bb | 3 ++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/openjade/openjade-1.3.2/no-libtool.patch (limited to 'meta/recipes-devtools') 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 0000000000..2f57c000f6 --- /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 . + +Signed-off-by: Ross Burton +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\s/\.la /g' | sed s/\.a$$/\.la/` > 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 a304daadf3..bc250080f1 100644 --- a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb +++ b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb @@ -17,7 +17,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/openjade-${PV}.tar.gz \ file://msggen.pl.patch \ file://reautoconf.patch \ file://user-declared-default-constructor.patch \ - file://fix-regex.patch" + file://fix-regex.patch \ + file://no-libtool.patch" SRC_URI[md5sum] = "7df692e3186109cc00db6825b777201e" SRC_URI[sha256sum] = "1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1" -- cgit v1.2.3-54-g00ecf