[OE-core] [V2][PATCH 1/1] openjade: do not produce shared libraries
Joe Slater
jslater at windriver.com
Tue Aug 13 18:42:39 UTC 2013
CQID: 429576
openjade is the only one that uses the shared
libraries and sometimes it cannot find them!
Signed-off-by: Joe Slater <jslater at windriver.com>
---
.../openjade/openjade-native_1.3.2.bb | 29 ++++++++++++++-----
1 files changed, 21 insertions(+), 8 deletions(-)
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 8af0b52..189cb02 100644
--- a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
+++ b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
@@ -7,7 +7,7 @@ SECTION = "base"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=641ff1e4511f0a87044ad42f87cb1045"
-PR = "r5"
+PR = "r6"
DEPENDS = "opensp-native sgml-common-native"
RDEPENDS_${PN} = "sgml-common-native"
@@ -24,8 +24,13 @@ SRC_URI[sha256sum] = "1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7
inherit autotools native
+# Per bugzilla.yoctoproject.org/show_bug.cgi?id=2972 we do
+# not create shared libraries. Note that openjade still links
+# to shared libraries from other packages.
+#
EXTRA_OECONF = "--enable-spincludedir=${STAGING_INCDIR}/OpenSP \
- --enable-splibdir=${STAGING_LIBDIR}"
+ --enable-splibdir=${STAGING_LIBDIR} \
+ --disable-shared"
# We need to set datadir explicitly, but adding it to EXTRA_OECONF
# results in it being specified twice when configure is run.
@@ -55,13 +60,21 @@ do_compile_prepend () {
do_install() {
# Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/openjade.html
# for details.
- install -d ${D}${bindir}
- install -m 0755 ${S}/jade/.libs/openjade ${D}${bindir}/openjade
- ln -sf openjade ${D}${bindir}/jade
+ install -d ${D}${bindir}
- oe_libinstall -a -so -C style libostyle ${D}${libdir}
- oe_libinstall -a -so -C spgrove libospgrove ${D}${libdir}
- oe_libinstall -a -so -C grove libogrove ${D}${libdir}
+ # install shared library version if it exists
+ #
+ if [ -f ${S}/jade/.libs/openjade ]
+ then
+ install -m 0755 ${S}/jade/.libs/openjade ${D}${bindir}/openjade
+ oe_libinstall -a -so -C style libostyle ${D}${libdir}
+ oe_libinstall -a -so -C spgrove libospgrove ${D}${libdir}
+ oe_libinstall -a -so -C grove libogrove ${D}${libdir}
+ else
+ install -m 0755 ${S}/jade/openjade ${D}${bindir}/openjade
+ fi
+
+ ln -sf openjade ${D}${bindir}/jade
install -d ${D}${datadir}/sgml/openjade-${PV}
install -m 644 dsssl/catalog ${D}${datadir}/sgml/openjade-${PV}
--
1.7.3.4
More information about the Openembedded-core
mailing list