summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/quilt
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/quilt')
-rw-r--r--meta/recipes-devtools/quilt/quilt-native.inc18
-rw-r--r--meta/recipes-devtools/quilt/quilt-native_0.65.bb2
-rw-r--r--meta/recipes-devtools/quilt/quilt.inc21
-rw-r--r--meta/recipes-devtools/quilt/quilt_0.65.bb6
4 files changed, 21 insertions, 26 deletions
diff --git a/meta/recipes-devtools/quilt/quilt-native.inc b/meta/recipes-devtools/quilt/quilt-native.inc
deleted file mode 100644
index f6b1bd53af..0000000000
--- a/meta/recipes-devtools/quilt/quilt-native.inc
+++ /dev/null
@@ -1,18 +0,0 @@
1RDEPENDS_${PN} = "diffstat-native patch-native bzip2-native"
2
3INHIBIT_AUTOTOOLS_DEPS = "1"
4
5inherit native
6
7PATCHTOOL = "patch"
8EXTRA_OECONF_append = " --disable-nls"
9
10do_configure () {
11 oe_runconf
12}
13
14do_install_append () {
15 # Dummy quiltrc file for patch.bbclass
16 install -d ${D}${sysconfdir}/
17 touch ${D}${sysconfdir}/quiltrc
18}
diff --git a/meta/recipes-devtools/quilt/quilt-native_0.65.bb b/meta/recipes-devtools/quilt/quilt-native_0.65.bb
index 6bc7dcdb7a..22374425fa 100644
--- a/meta/recipes-devtools/quilt/quilt-native_0.65.bb
+++ b/meta/recipes-devtools/quilt/quilt-native_0.65.bb
@@ -1,2 +1,2 @@
1require quilt.inc 1require quilt.inc
2require quilt-native.inc 2inherit native
diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc
index 48ed9babf7..150df3d572 100644
--- a/meta/recipes-devtools/quilt/quilt.inc
+++ b/meta/recipes-devtools/quilt/quilt.inc
@@ -11,14 +11,21 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/quilt/quilt-${PV}.tar.gz \
11 file://0001-tests-Allow-different-output-from-mv.patch \ 11 file://0001-tests-Allow-different-output-from-mv.patch \
12" 12"
13 13
14SRC_URI_append_class-target = " file://gnu_patch_test_fix_target.patch"
15
14SRC_URI[md5sum] = "c67ba0228f5b7b8bbe469474661f92d6" 16SRC_URI[md5sum] = "c67ba0228f5b7b8bbe469474661f92d6"
15SRC_URI[sha256sum] = "f6cbc788e5cbbb381a3c6eab5b9efce67c776a8662a7795c7432fd27aa096819" 17SRC_URI[sha256sum] = "f6cbc788e5cbbb381a3c6eab5b9efce67c776a8662a7795c7432fd27aa096819"
16 18
17inherit autotools-brokensep ptest 19inherit autotools-brokensep ptest
18 20
21INHIBIT_AUTOTOOLS_DEPS_class-native = "1"
22PATCHTOOL_class-native = "patch"
23
19CLEANBROKEN = "1" 24CLEANBROKEN = "1"
20 25
21EXTRA_OECONF = "--with-perl='${USRBINPATH}/env perl' --with-patch=patch" 26EXTRA_OECONF = "--with-perl='${USRBINPATH}/env perl' --with-patch=patch"
27EXTRA_OECONF_append_class-native = " --disable-nls"
28EXTRA_AUTORECONF += "--exclude=aclocal"
22 29
23CACHED_CONFIGUREVARS += "ac_cv_path_BASH=/bin/bash" 30CACHED_CONFIGUREVARS += "ac_cv_path_BASH=/bin/bash"
24 31
@@ -33,6 +40,10 @@ do_configure_append () {
33 sed -e 's,^COMPAT_SYMLINKS.*:=.*,COMPAT_SYMLINKS :=,' -i ${S}/Makefile 40 sed -e 's,^COMPAT_SYMLINKS.*:=.*,COMPAT_SYMLINKS :=,' -i ${S}/Makefile
34} 41}
35 42
43do_configure_class-native () {
44 oe_runconf
45}
46
36# quilt Makefiles install to BUILD_ROOT instead of DESTDIR 47# quilt Makefiles install to BUILD_ROOT instead of DESTDIR
37do_install () { 48do_install () {
38 oe_runmake 'BUILD_ROOT=${D}' install 49 oe_runmake 'BUILD_ROOT=${D}' install
@@ -40,6 +51,12 @@ do_install () {
40 rm -rf ${D}/${datadir}/emacs 51 rm -rf ${D}/${datadir}/emacs
41} 52}
42 53
54do_install_append_class-native () {
55 # Dummy quiltrc file for patch.bbclass
56 install -d ${D}${sysconfdir}/
57 touch ${D}${sysconfdir}/quiltrc
58}
59
43do_compile_ptest() { 60do_compile_ptest() {
44 oe_runmake bin/patch-wrapper test/.depend 61 oe_runmake bin/patch-wrapper test/.depend
45} 62}
@@ -61,7 +78,9 @@ FILES_guards = "${bindir}/guards"
61FILES_${PN}-doc = "${mandir}/man1/quilt.1 ${docdir}/${BPN}" 78FILES_${PN}-doc = "${mandir}/man1/quilt.1 ${docdir}/${BPN}"
62FILES_guards-doc = "${mandir}/man1/guards.1" 79FILES_guards-doc = "${mandir}/man1/guards.1"
63 80
64RDEPENDS_${PN} = "bash" 81RDEPENDS_${PN} = "bash patch diffstat bzip2 util-linux"
82RDEPENDS_${PN}_class-native = "diffstat-native patch-native bzip2-native"
83
65RDEPENDS_${PN}-ptest = "make file sed gawk diffutils findutils ed perl \ 84RDEPENDS_${PN}-ptest = "make file sed gawk diffutils findutils ed perl \
66 perl-module-filehandle perl-module-getopt-std \ 85 perl-module-filehandle perl-module-getopt-std \
67 perl-module-posix perl-module-file-temp \ 86 perl-module-posix perl-module-file-temp \
diff --git a/meta/recipes-devtools/quilt/quilt_0.65.bb b/meta/recipes-devtools/quilt/quilt_0.65.bb
index 5bf818d0bb..ff9726576e 100644
--- a/meta/recipes-devtools/quilt/quilt_0.65.bb
+++ b/meta/recipes-devtools/quilt/quilt_0.65.bb
@@ -1,8 +1,2 @@
1require quilt.inc 1require quilt.inc
2inherit gettext 2inherit gettext
3
4SRC_URI += "file://gnu_patch_test_fix_target.patch"
5
6EXTRA_AUTORECONF += "--exclude=aclocal"
7
8RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"