summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPhil Blundell <philb@brightsign.biz>2013-05-14 11:59:37 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-07 13:40:15 +0000
commit3eb6135d8958037b4e81c7ab034d9be2e5c20899 (patch)
treef62c3eb0f1c3abc3d5122681d548568b77c840a7 /meta
parent6308c47f2eb10dd801d4cc58e7c315251d131a29 (diff)
downloadpoky-3eb6135d8958037b4e81c7ab034d9be2e5c20899.tar.gz
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 <philb@brightsign.biz> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/openjade/openjade-1.3.2/no-libtool.patch20
-rw-r--r--meta/recipes-devtools/openjade/openjade-native_1.3.2.bb3
2 files changed, 22 insertions, 1 deletions
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 @@
1The openjade build is fairly unique in auto-generating explicit dependencies to
2installed .la files. As some distributions may delete these files unless
3clearly required, change the Makefile fragment to depend on the .so instead.
4
5Patch originally by Phil Blundell <philb@brightsign.biz>.
6
7Signed-off-by: Ross Burton <ross.burton@intel.com>
8Upstream-Status: Inappropriate
9
10--- openjade-1.3.2/Makefile.prog.in~ 2013-05-14 11:42:02.646782318 +0100
11+++ openjade-1.3.2/Makefile.prog.in 2013-05-14 11:54:55.051728343 +0100
12@@ -12,7 +12,7 @@
13
14 ALL_LIBS = $(XLIBS) $(LIBS)
15 Makefile.lt:
16- echo 'LT_LIBS='`echo $(ALL_LIBS) | sed 's/\.a\s/\.la /g' | sed s/\.a$$/\.la/` > Makefile.lt
17+ 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
18
19 PROG:=$(shell echo "$(PROG)" | sed '@program_transform_name@')
20
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 \
17 file://msggen.pl.patch \ 17 file://msggen.pl.patch \
18 file://reautoconf.patch \ 18 file://reautoconf.patch \
19 file://user-declared-default-constructor.patch \ 19 file://user-declared-default-constructor.patch \
20 file://fix-regex.patch" 20 file://fix-regex.patch \
21 file://no-libtool.patch"
21 22
22SRC_URI[md5sum] = "7df692e3186109cc00db6825b777201e" 23SRC_URI[md5sum] = "7df692e3186109cc00db6825b777201e"
23SRC_URI[sha256sum] = "1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1" 24SRC_URI[sha256sum] = "1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1"