diff options
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/classes/autotools-bootstrap.bbclass | 24 | ||||
| -rw-r--r-- | meta-oe/recipes-graphics/fontforge/fontforge_20150824.bb | 18 |
2 files changed, 17 insertions, 25 deletions
diff --git a/meta-oe/classes/autotools-bootstrap.bbclass b/meta-oe/classes/autotools-bootstrap.bbclass deleted file mode 100644 index 8d7af1b472..0000000000 --- a/meta-oe/classes/autotools-bootstrap.bbclass +++ /dev/null @@ -1,24 +0,0 @@ -# Class to inherit when you want to build with autotools after running bootstrap -inherit autotools - -DEPENDS += "gnulib" - -do_configure_prepend() { - currdir=`pwd` - cd ${S} - - # avoid bootstrap cloning gnulib on every configure - cat >.gitmodules <<EOF -[submodule "gnulib"] - path = gnulib - url = git://git.sv.gnu.org/gnulib -EOF - cp -rf ${STAGING_DATADIR}/gnulib ${S} - - # --force to avoid errors on reconfigure e.g if recipes changed we depend on - # | bootstrap: running: libtoolize --quiet - # | libtoolize: error: 'libltdl/COPYING.LIB' exists: use '--force' to overwrite - # | ... - ./bootstrap --force - cd $currdir -} diff --git a/meta-oe/recipes-graphics/fontforge/fontforge_20150824.bb b/meta-oe/recipes-graphics/fontforge/fontforge_20150824.bb index b50202d0a6..53899f13cd 100644 --- a/meta-oe/recipes-graphics/fontforge/fontforge_20150824.bb +++ b/meta-oe/recipes-graphics/fontforge/fontforge_20150824.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "glib-2.0 pango giflib tiff libxml2 jpeg python libtool uthash" DEPENDS_append_class-target = " libxi" -inherit autotools-bootstrap pkgconfig pythonnative distro_features_check +inherit autotools pkgconfig pythonnative distro_features_check REQUIRED_DISTRO_FEATURES_append_class-target = " x11" @@ -24,8 +24,24 @@ do_configure_prepend() { # uthash sources are expected in uthash/src currdir=`pwd` cd ${S} + mkdir -p uthash/src cp ${STAGING_INCDIR}/ut*.h uthash/src + + # avoid bootstrap cloning gnulib on every configure + cat >.gitmodules <<EOF +[submodule "gnulib"] + path = gnulib + url = git://git.sv.gnu.org/gnulib +EOF + cp -rf ${STAGING_DATADIR}/gnulib ${S} + + # --force to avoid errors on reconfigure e.g if recipes changed we depend on + # | bootstrap: running: libtoolize --quiet + # | libtoolize: error: 'libltdl/COPYING.LIB' exists: use '--force' to overwrite + # | ... + ./bootstrap --force + cd $currdir } |