summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/quilt
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-11-30 13:56:09 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-10 22:45:19 +0000
commit8162e72b06ad80116b1022f1cb4e607b07e150ab (patch)
tree7a942229201fd71ad7d91256f9147c7020639fd7 /meta/recipes-devtools/quilt
parent741394e472bc8af8901c97574400d2a39644ab3a (diff)
downloadpoky-8162e72b06ad80116b1022f1cb4e607b07e150ab.tar.gz
quilt: don't patch in an old acinclude.m4, just excude aclocal
(From OE-Core rev: 21479f1a9e2b77c014d02ddaf2a9a2ee8057b625) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/quilt')
-rw-r--r--meta/recipes-devtools/quilt/quilt/aclocal.patch128
-rw-r--r--meta/recipes-devtools/quilt/quilt_0.65.bb8
2 files changed, 5 insertions, 131 deletions
diff --git a/meta/recipes-devtools/quilt/quilt/aclocal.patch b/meta/recipes-devtools/quilt/quilt/aclocal.patch
deleted file mode 100644
index daf44295ec..0000000000
--- a/meta/recipes-devtools/quilt/quilt/aclocal.patch
+++ /dev/null
@@ -1,128 +0,0 @@
1Upstream-Status: Pending
2
3Add the aclocal.m4 as acinclude.m4
4
5Index: quilt-0.47/acinclude.m4
6===================================================================
7--- /dev/null 1970-01-01 00:00:00.000000000 +0000
8+++ quilt-0.47/acinclude.m4 2006-10-10 17:05:56.000000000 +0100
9@@ -0,0 +1,119 @@
10+dnl Allow configure to specify a specific binary
11+dnl 1: Environment variable
12+dnl 2: binary name
13+dnl 3: optional list of alternative binary names
14+dnl 4: optional list of additional search directories
15+AC_DEFUN([QUILT_COMPAT_PROG_PATH],[
16+ m4_define([internal_$2_cmd],[esyscmd(ls compat/$2.in 2>/dev/null)])
17+
18+ AC_ARG_WITH($2, AC_HELP_STRING(
19+ [--with-$2], [name of the $2 executable to use]
20+ m4_if(internal_$2_cmd,[],[],[ (use --without-$2
21+ to use an internal mechanism)])),
22+ [
23+ if test x"$withval" = xnone; then
24+ AC_MSG_ERROR([Invalid configure argument. use --without-$2])
25+ fi
26+ if test x"$withval" != xno; then
27+ AC_MSG_CHECKING(for $2)
28+ $1="$withval"
29+ if test -e "$$1"; then
30+ if test ! -f "$$1" -a ! -h "$$1" || test ! -x "$$1"; then
31+ AC_MSG_ERROR([$$1 is not an executable file])
32+ fi
33+ fi
34+ AC_MSG_RESULT([$$1])
35+ if test ! -e "$$1"; then
36+ AC_MSG_WARN([$$1 does not exist])
37+ fi
38+ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2"
39+ fi
40+ ],[
41+ m4_if([$3],[],[
42+ AC_PATH_PROG($1,$2,,$PATH:$4)
43+ ],[
44+ AC_PATH_PROGS($1,$3,,$PATH:$4)
45+ if test -n "$$1" -a "`expr "$$1" : '.*/\([[^/]]*\)$'`" != "$2"; then
46+ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2"
47+ fi
48+ ])
49+ m4_if([$4],[],[],[
50+ if test -n "$$1"; then
51+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
52+ for dir in "$4"; do
53+ if test "`dirname $$1`" = "$dir"; then
54+ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2"
55+ break
56+ fi
57+ done
58+ IFS="$as_save_IFS"
59+ fi
60+ ])
61+ ])
62+ if test -z "$$1"; then
63+ m4_if(internal_$2_cmd,[],[
64+ AC_MSG_ERROR([Please specify the location of $2 with the option '--with-$2'])
65+ ],[
66+ AC_MSG_WARN([Using internal $2 mechanism. Use option '--with-$2' to override])
67+ COMPAT_PROGRAMS="$COMPAT_PROGRAMS $2"
68+ $1=$2
69+ INTERNAL_$1=1
70+ ])
71+ fi
72+ AC_SUBST($1)
73+])
74+
75+dnl Allow configure to specify a specific binary
76+dnl This variant is for optional binaries.
77+dnl 1: Environment variable
78+dnl 2: binary name
79+dnl 3: optional list of alternative binary names
80+dnl 4: optional list of additional search directories
81+AC_DEFUN([QUILT_COMPAT_PROG_PATH_OPT],[
82+ AC_ARG_WITH($2, AC_HELP_STRING(
83+ [--with-$2], [name of the $2 executable to use]),
84+ [
85+ if test x"$withval" != xno; then
86+ AC_MSG_CHECKING(for $2)
87+ $1="$withval"
88+ if test -e "$$1"; then
89+ if test ! -f "$$1" -a ! -h "$$1" || test ! -x "$$1"; then
90+ AC_MSG_ERROR([$$1 is not an executable file])
91+ fi
92+ fi
93+ AC_MSG_RESULT([$$1])
94+ if test ! -e "$$1"; then
95+ AC_MSG_WARN([$$1 does not exist])
96+ fi
97+ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2"
98+ fi
99+ ],[
100+ m4_if([$3],[],[
101+ AC_PATH_PROG($1,$2,,$PATH:$4)
102+ ],[
103+ AC_PATH_PROGS($1,$3,,$PATH:$4)
104+ if test -n "$$1" -a "`expr "$$1" : '.*/\([[^/]]*\)$'`" != "$2"; then
105+ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2"
106+ fi
107+ ])
108+ m4_if([$4],[],[],[
109+ if test -n "$$1"; then
110+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
111+ for dir in "$4"; do
112+ if test "`dirname $$1`" = "$dir"; then
113+ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2"
114+ break
115+ fi
116+ done
117+ IFS="$as_save_IFS"
118+ fi
119+ ])
120+ if test -z "$$1"; then
121+ AC_MSG_WARN([$2 not found, some optional functionalities will be missing])
122+ fi
123+ ])
124+ if test -z "$$1"; then
125+ $1=$2
126+ fi
127+ AC_SUBST($1)
128+])
diff --git a/meta/recipes-devtools/quilt/quilt_0.65.bb b/meta/recipes-devtools/quilt/quilt_0.65.bb
index 12859f0bcc..5bf818d0bb 100644
--- a/meta/recipes-devtools/quilt/quilt_0.65.bb
+++ b/meta/recipes-devtools/quilt/quilt_0.65.bb
@@ -1,6 +1,8 @@
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
3RDEPENDS_${PN} += "patch diffstat bzip2 util-linux" 8RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
4SRC_URI += "file://aclocal.patch \
5 file://gnu_patch_test_fix_target.patch \
6 "