817a98d74a
This is a backport of 952e5e2b7a5c1deefc939594d40b81a71fb16a54 from oe master.
Without this the script mangling goes very wrong if ${prefix}="". There
isn't really any way to fix this in the completely general case, but
this patch does work with the two cases I tested (freetype and
gpg-error) which were unusable previously.
(From OE-Core rev: 854b15bf631452150d1979dfd8286b306f108688)
Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
55 lines
2 KiB
Text
55 lines
2 KiB
Text
# The namespaces can clash here hence the two step replace
|
|
def get_binconfig_mangle(d):
|
|
s = "-e ''"
|
|
if not bb.data.inherits_class('native', d):
|
|
optional_quote = r"\(\"\?\)"
|
|
s += " -e 's:=%s${libdir}:=\\1OELIBDIR:;'" % optional_quote
|
|
s += " -e 's:=%s${includedir}:=\\1OEINCDIR:;'" % optional_quote
|
|
s += " -e 's:=%s${datadir}:=\\1OEDATADIR:'" % optional_quote
|
|
s += " -e 's:=%s${prefix}/:=\\1OEPREFIX/:'" % optional_quote
|
|
s += " -e 's:=%s${exec_prefix}/:=\\1OEEXECPREFIX/:'" % optional_quote
|
|
s += " -e 's:-L${libdir}:-LOELIBDIR:;'"
|
|
s += " -e 's:-I${includedir}:-IOEINCDIR:;'"
|
|
s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'"
|
|
s += " -e 's:OEINCDIR:${STAGING_INCDIR}:;'"
|
|
s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'"
|
|
s += " -e 's:OEPREFIX:${STAGING_DIR_HOST}${prefix}:'"
|
|
s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${exec_prefix}:'"
|
|
s += " -e 's:-I${WORKDIR}:-I${STAGING_INCDIR}:'"
|
|
s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'"
|
|
return s
|
|
|
|
BINCONFIG_GLOB ?= "*-config"
|
|
|
|
PACKAGE_PREPROCESS_FUNCS += "binconfig_package_preprocess"
|
|
|
|
binconfig_package_preprocess () {
|
|
for config in `find ${PKGD} -name '${BINCONFIG_GLOB}'`; do
|
|
sed -i \
|
|
-e 's:${STAGING_LIBDIR}:${libdir}:g;' \
|
|
-e 's:${STAGING_INCDIR}:${includedir}:g;' \
|
|
-e 's:${STAGING_DATADIR}:${datadir}:' \
|
|
-e 's:${STAGING_DIR_HOST}${prefix}:${prefix}:' \
|
|
$config
|
|
done
|
|
for lafile in `find ${PKGD} -name "*.la"` ; do
|
|
sed -i \
|
|
-e 's:${STAGING_LIBDIR}:${libdir}:g;' \
|
|
-e 's:${STAGING_INCDIR}:${includedir}:g;' \
|
|
-e 's:${STAGING_DATADIR}:${datadir}:' \
|
|
-e 's:${STAGING_DIR_HOST}${prefix}:${prefix}:' \
|
|
$lafile
|
|
done
|
|
}
|
|
|
|
SYSROOT_PREPROCESS_FUNCS += "binconfig_sysroot_preprocess"
|
|
|
|
binconfig_sysroot_preprocess () {
|
|
for config in `find ${S} -name '${BINCONFIG_GLOB}'`; do
|
|
configname=`basename $config`
|
|
install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}
|
|
cat $config | sed ${@get_binconfig_mangle(d)} > ${SYSROOT_DESTDIR}${bindir_crossscripts}/$configname
|
|
chmod u+x ${SYSROOT_DESTDIR}${bindir_crossscripts}/$configname
|
|
done
|
|
}
|