diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb')
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb b/import-layers/yocto-poky/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb index bc250080f..8b15b0c7e 100644 --- a/import-layers/yocto-poky/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb +++ b/import-layers/yocto-poky/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb @@ -44,10 +44,10 @@ CONFIGUREOPTS := "${@d.getVar('CONFIGUREOPTS', True).replace('--datadir=${datadi oe_runconf[vardepsexclude] += "CONFIGUREOPTS" CFLAGS =+ "-I${S}/include" +CXXFLAGS += "-fno-tree-dse" SSTATEPOSTINSTFUNCS += "openjade_sstate_postinst" SYSROOT_PREPROCESS_FUNCS += "openjade_sysroot_preprocess" -CLEANFUNCS += "openjade_sstate_clean" # configure.in needs to be reloacted to trigger reautoconf do_extraunpack () { @@ -103,6 +103,15 @@ openjade_sstate_postinst() { ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-openjade \ --add ${sysconfdir}/sgml/sgml-docbook.cat \ ${sysconfdir}/sgml/openjade-${PV}.cat + cat << EOF > ${SSTATE_INST_POSTRM} +#!/bin/sh +# Ensure that the catalog file sgml-docbook.cat is properly +# updated when the package is removed from sstate cache. +files="${sysconfdir}/sgml/sgml-docbook.bak ${sysconfdir}/sgml/sgml-docbook.cat" +for f in \$files; do + [ ! -f \$f ] || sed -i '/\/sgml\/openjade-${PV}.cat/d' \$f +done +EOF fi } @@ -110,12 +119,3 @@ openjade_sysroot_preprocess () { install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ install -m 755 ${STAGING_BINDIR_NATIVE}/install-catalog ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-openjade } - -openjade_sstate_clean () { - # Ensure that the catalog file sgml-docbook.cat is properly - # updated when the package is removed from sstate cache. - files="${sysconfdir}/sgml/sgml-docbook.bak ${sysconfdir}/sgml/sgml-docbook.cat" - for f in $files; do - [ ! -f $f ] || sed -i '/\/sgml\/openjade-${PV}.cat/d' $f - done -} |