From 030992bdd415c8892cf2925cf6fbe888226be046 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Thu, 27 Dec 2007 11:46:52 +0000 Subject: classes/binconfig.bbclass: Allow packages to add sed expressions packages/apr/apr-util,apr: patch the config files to be 'installed' and not point to the build and source-directory. --- classes/binconfig.bbclass | 2 ++ packages/apr/apr-util_1.2.7.bb | 3 +++ packages/apr/apr_1.2.7.bb | 2 ++ 3 files changed, 7 insertions(+) diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass index 4e425a76d6..5ce9ff6f0d 100644 --- a/classes/binconfig.bbclass +++ b/classes/binconfig.bbclass @@ -20,6 +20,8 @@ def get_binconfig_mangle(d): s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${layout_exec_prefix}:'" s += " -e 's:-I${WORKDIR}:-I${STAGING_INCDIR}:'" s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'" + if bb.data.getVar("OE_BINCONFIG_EXTRA_MANGLE", d): + s += bb.data.getVar("OE_BINCONFIG_EXTRA_MANGLE", d) return s BINCONFIG_GLOB ?= "*-config" diff --git a/packages/apr/apr-util_1.2.7.bb b/packages/apr/apr-util_1.2.7.bb index ea81607953..1543714133 100644 --- a/packages/apr/apr-util_1.2.7.bb +++ b/packages/apr/apr-util_1.2.7.bb @@ -14,8 +14,11 @@ EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm \ --without-sqlite3 \ --with-expat=${STAGING_DIR_HOST}${layout_prefix}" + inherit autotools lib_package binconfig +OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" + do_configure() { oe_runconf } diff --git a/packages/apr/apr_1.2.7.bb b/packages/apr/apr_1.2.7.bb index 2016ca0126..d11c1f565e 100644 --- a/packages/apr/apr_1.2.7.bb +++ b/packages/apr/apr_1.2.7.bb @@ -9,6 +9,8 @@ SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2" inherit autotools lib_package binconfig +OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" + do_configure() { oe_runconf } -- cgit v1.2.3 From 1190d17f949bfc67f82e2f66bf6e43b5c768631d Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Thu, 27 Dec 2007 12:23:23 +0000 Subject: packages/apr/apr,apr-util: Stage the apr_rules.mk and install it as rules.mk in apr-util --- packages/apr/apr-util_1.2.7.bb | 1 + packages/apr/apr_1.2.7.bb | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/apr/apr-util_1.2.7.bb b/packages/apr/apr-util_1.2.7.bb index 1543714133..70ac239642 100644 --- a/packages/apr/apr-util_1.2.7.bb +++ b/packages/apr/apr-util_1.2.7.bb @@ -20,6 +20,7 @@ inherit autotools lib_package binconfig OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'" do_configure() { + cp ${STAGING_DATADIR}/apr_rules.mk ${S}/build/rules.mk oe_runconf } diff --git a/packages/apr/apr_1.2.7.bb b/packages/apr/apr_1.2.7.bb index d11c1f565e..d0f2916bfa 100644 --- a/packages/apr/apr_1.2.7.bb +++ b/packages/apr/apr_1.2.7.bb @@ -17,4 +17,5 @@ do_configure() { do_stage() { autotools_stage_all + cp ${S}/build/apr_rules.mk ${STAGING_DATADIR} } -- cgit v1.2.3 From a242fd05d310476b1e6c599ebaeb9e96ae4d1e83 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Thu, 27 Dec 2007 12:46:11 +0000 Subject: packages/apr/apr-util: Manually patch the .la file to not reference /usr/lib/FOO.la but use -lFOO instead subversion is still compiling and we have no more references to the workdir! --- packages/apr/apr-util_1.2.7.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/apr/apr-util_1.2.7.bb b/packages/apr/apr-util_1.2.7.bb index 70ac239642..904e41f8a3 100644 --- a/packages/apr/apr-util_1.2.7.bb +++ b/packages/apr/apr-util_1.2.7.bb @@ -25,5 +25,8 @@ do_configure() { } do_stage() { - autotools_stage_all + autotools_stage_all + sed -i s,/usr/lib/libgdbm.la,-lgdbm,g ${STAGING_LIBDIR}/libaprutil-1.la + sed -i s,/usr/lib/libexpat.la,-lexpat,g ${STAGING_LIBDIR}/libaprutil-1.la + sed -i s,/usr/lib/libapr-1.la,-lapr-1,g ${STAGING_LIBDIR}/libaprutil-1.la } -- cgit v1.2.3 From a4db694c91c857abdba5a875314e3206c195e5a4 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Thu, 27 Dec 2007 12:59:27 +0000 Subject: packages/qt4/qt_staging.inc: Manually fix the .la files to say installed=no --- packages/qt4/qt_staging.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/qt4/qt_staging.inc b/packages/qt4/qt_staging.inc index 37002ca50e..6048d7b03e 100644 --- a/packages/qt4/qt_staging.inc +++ b/packages/qt4/qt_staging.inc @@ -18,6 +18,7 @@ do_stage() { for i in ${STAGE_TEMP}/${libdir}/*.la do + sed -i s,installed=yes,installed=no, $i cp -fpPR $i ${STAGING_LIBDIR}/${QT_DIR_NAME}/ oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $(basename $i .la) ${STAGING_LIBDIR}/${QT_DIR_NAME} done -- cgit v1.2.3 From 4acfd704d0eb15143f1487ef728e6900dcdc460d Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Thu, 27 Dec 2007 13:37:33 +0000 Subject: classes/autotools.bbclass: Use bruteforce and set installed=yes to =no This is silenting issues with various libtool files that have installed=yes. --- classes/autotools.bbclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index 8e4fba9400..991e472b14 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -174,6 +174,8 @@ autotools_stage_all() { fi if [ -d ${STAGE_TEMP}/${libdir} ] then + find ${STAGE_TEMP}/${libdir} -name '*.la' -exec sed -i s,installed=yes,installed=no, {} \; + for i in ${STAGE_TEMP}/${libdir}/*.la do if [ ! -f "$i" ]; then -- cgit v1.2.3