diff options
Diffstat (limited to 'poky/meta/recipes-devtools/quilt/quilt.inc')
| -rw-r--r-- | poky/meta/recipes-devtools/quilt/quilt.inc | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/poky/meta/recipes-devtools/quilt/quilt.inc b/poky/meta/recipes-devtools/quilt/quilt.inc index c7bb741b4..48ed9babf 100644 --- a/poky/meta/recipes-devtools/quilt/quilt.inc +++ b/poky/meta/recipes-devtools/quilt/quilt.inc @@ -16,24 +16,8 @@ SRC_URI[sha256sum] = "f6cbc788e5cbbb381a3c6eab5b9efce67c776a8662a7795c7432fd27aa inherit autotools-brokensep ptest -EXTRA_OECONF_darwin += "--without-date \ - --without-getopt \ - " - CLEANBROKEN = "1" -PACKAGES += "guards guards-doc" -FILES_${PN} = "${sysconfdir} ${datadir}/quilt \ - ${bindir}/quilt ${libdir}/quilt" -FILES_guards = "${bindir}/guards" -FILES_${PN}-doc = "${mandir}/man1/quilt.1 ${docdir}/${BPN}" -FILES_guards-doc = "${mandir}/man1/guards.1" - -RDEPENDS_${PN} = "bash" - -EXTRA_OE_MAKE_ARGS_darwin ?= "" -EXTRA_OE_MAKE_ARGS ?= "BUILD_ROOT=${D}" - EXTRA_OECONF = "--with-perl='${USRBINPATH}/env perl' --with-patch=patch" CACHED_CONFIGUREVARS += "ac_cv_path_BASH=/bin/bash" @@ -49,9 +33,9 @@ do_configure_append () { sed -e 's,^COMPAT_SYMLINKS.*:=.*,COMPAT_SYMLINKS :=,' -i ${S}/Makefile } -# quilt ignores DESTDIR +# quilt Makefiles install to BUILD_ROOT instead of DESTDIR do_install () { - oe_runmake ${EXTRA_OE_MAKE_ARGS} install + oe_runmake 'BUILD_ROOT=${D}' install # cleanup unpackaged files rm -rf ${D}/${datadir}/emacs } @@ -69,6 +53,15 @@ do_install_ptest() { cp ${WORKDIR}/test.sh ${D}${PTEST_PATH} } +PACKAGES += "guards guards-doc" + +FILES_${PN} = "${sysconfdir} ${datadir}/quilt \ + ${bindir}/quilt ${libdir}/quilt" +FILES_guards = "${bindir}/guards" +FILES_${PN}-doc = "${mandir}/man1/quilt.1 ${docdir}/${BPN}" +FILES_guards-doc = "${mandir}/man1/guards.1" + +RDEPENDS_${PN} = "bash" RDEPENDS_${PN}-ptest = "make file sed gawk diffutils findutils ed perl \ perl-module-filehandle perl-module-getopt-std \ perl-module-posix perl-module-file-temp \ |
