summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/quilt/quilt
diff options
context:
space:
mode:
authorTudor Florea <tudor.florea@enea.com>2015-10-09 22:59:03 +0200
committerTudor Florea <tudor.florea@enea.com>2015-10-09 22:59:03 +0200
commit972dcfcdbfe75dcfeb777150c136576cf1a71e99 (patch)
tree97a61cd7e293d7ae9d56ef7ed0f81253365bb026 /meta/recipes-devtools/quilt/quilt
downloadpoky-972dcfcdbfe75dcfeb777150c136576cf1a71e99.tar.gz
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta/recipes-devtools/quilt/quilt')
-rw-r--r--meta/recipes-devtools/quilt/quilt/Makefile13
-rw-r--r--meta/recipes-devtools/quilt/quilt/aclocal.patch128
-rw-r--r--meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch26
-rw-r--r--meta/recipes-devtools/quilt/quilt/install.patch13
-rwxr-xr-xmeta/recipes-devtools/quilt/quilt/run-ptest5
5 files changed, 185 insertions, 0 deletions
diff --git a/meta/recipes-devtools/quilt/quilt/Makefile b/meta/recipes-devtools/quilt/quilt/Makefile
new file mode 100644
index 0000000000..7b3ac8a492
--- /dev/null
+++ b/meta/recipes-devtools/quilt/quilt/Makefile
@@ -0,0 +1,13 @@
1PATH := $(CURDIR)/bin:$(CURDIR)/compat:$(PATH)
2QUILT_DIR := $(CURDIR)/quilt
3QUILTRC := $(CURDIR)/test/test.quiltrc
4export QUILT_DIR QUILTRC
5CHECK_ENV := P=patches/; _P=../patches/; export P _P
6-include test/.depend
7
8check-% : test/%.test
9 @LANG=C; LC_ALL=C; \
10 export LANG LC_ALL; \
11 $(CHECK_ENV); \
12 cd $(<D); \
13 ./run -q $(<F)
diff --git a/meta/recipes-devtools/quilt/quilt/aclocal.patch b/meta/recipes-devtools/quilt/quilt/aclocal.patch
new file mode 100644
index 0000000000..daf44295ec
--- /dev/null
+++ b/meta/recipes-devtools/quilt/quilt/aclocal.patch
@@ -0,0 +1,128 @@
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/gnu_patch_test_fix_target.patch b/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch
new file mode 100644
index 0000000000..672155bb65
--- /dev/null
+++ b/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch
@@ -0,0 +1,26 @@
1Upstream-Status: Pending
2
3the test should be skipped for cross compiling.
4
5Signed-off-by: Qing He <qing.he@intel.com>
6
7diff --git a/configure.ac b/configure.ac
8index 026a36c..8af591b 100644
9--- a/configure.ac
10+++ b/configure.ac
11@@ -245,6 +245,7 @@ fi
12 QUILT_COMPAT_PROG_PATH(DIFF, diff)
13 QUILT_COMPAT_PROG_PATH(PATCH, patch)
14
15+if test "x$cross_compiling" != "xyes"; then
16 # Sun diff and others will not work because GNU patch options are used.
17 AC_MSG_CHECKING([the version of $DIFF])
18 if $DIFF --version 2>/dev/null | grep GNU >/dev/null; then
19@@ -293,6 +294,7 @@ current version of patch from ftp.gnu.org, or if you already have GNU patch
20 then you can supply its path with the '--with-patch=' option.
21 ])
22 fi
23+fi
24
25 QUILT_COMPAT_PROG_PATH(FIND, find)
26
diff --git a/meta/recipes-devtools/quilt/quilt/install.patch b/meta/recipes-devtools/quilt/quilt/install.patch
new file mode 100644
index 0000000000..e2a7af6550
--- /dev/null
+++ b/meta/recipes-devtools/quilt/quilt/install.patch
@@ -0,0 +1,13 @@
1Upstream-Status: Pending
2
3--- quilt-0.47/Makefile.in 2008-12-31 19:09:13.000000000 +0000
4+++ quilt-0.47/Makefile.in.orig 2008-08-21 13:21:32.000000000 +0100
5@@ -13,7 +13,7 @@
6 mandir := @mandir@
7 localedir := $(datadir)/locale
8 emacsdir := $(datadir)/emacs/site-lisp
9-etcdir := $(subst /usr/etc,/etc,$(prefix)/etc)
10+etcdir := @sysconfdir@
11
12 INSTALL := @INSTALL@
13 POD2MAN := @POD2MAN@
diff --git a/meta/recipes-devtools/quilt/quilt/run-ptest b/meta/recipes-devtools/quilt/quilt/run-ptest
new file mode 100755
index 0000000000..958a9df5b6
--- /dev/null
+++ b/meta/recipes-devtools/quilt/quilt/run-ptest
@@ -0,0 +1,5 @@
1#!/bin/sh
2
3ln -sf /bin/ed /usr/bin/ed
4for i in `ls test/*.test |awk -F. '{print $1}' |awk -F/ '{print $2}'`; do make check-$i; if [ $? -eq 0 ]; then echo PASS: $i.test; else echo FAIL: $i.test; fi; done
5rm -f /usr/bin/ed
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-22 16:17:24 +0000