summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/pax-utils/files/fix-configure-failure.patch146
-rw-r--r--meta/recipes-devtools/pax-utils/pax-utils_1.1.5.bb (renamed from meta/recipes-devtools/pax-utils/pax-utils_1.1.4.bb)7
2 files changed, 3 insertions, 150 deletions
diff --git a/meta/recipes-devtools/pax-utils/files/fix-configure-failure.patch b/meta/recipes-devtools/pax-utils/files/fix-configure-failure.patch
deleted file mode 100644
index 43bfeb6e46..0000000000
--- a/meta/recipes-devtools/pax-utils/files/fix-configure-failure.patch
+++ /dev/null
@@ -1,146 +0,0 @@
1From 70334129f5d849813c2ea5ce6070e6fb433412f7 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Wed, 13 Jan 2016 01:12:19 -0500
4Subject: [PATCH] autotools/m4: fix unexpected token 'AX_APPEND_FLAG'
5
6Added missing macro definition "ax_require_defined.m4" and "ax_append_flag.m4"
7to the m4 macro directories.
8...
9pax-utils-1.1.4/configure: line 33077: syntax error near unexpected token `AX_APPEND_FLAG'
10pax-utils-1.1.4/configure: line 33077: `AX_REQUIRE_DEFINED(AX_APPEND_FLAG)'
11...
12Upstream-Status: Pending
13
14Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
15---
16 autotools/m4/ax_append_flag.m4 | 72 ++++++++++++++++++++++++++++++++++++++
17 autotools/m4/ax_require_defined.m4 | 38 ++++++++++++++++++++
18 2 files changed, 110 insertions(+)
19 create mode 100644 autotools/m4/ax_append_flag.m4
20 create mode 100644 autotools/m4/ax_require_defined.m4
21
22diff --git a/autotools/m4/ax_append_flag.m4 b/autotools/m4/ax_append_flag.m4
23new file mode 100644
24index 0000000..c98a5c5
25--- /dev/null
26+++ b/autotools/m4/ax_append_flag.m4
27@@ -0,0 +1,72 @@
28+# ===========================================================================
29+# http://www.gnu.org/software/autoconf-archive/ax_append_flag.html
30+# ===========================================================================
31+#
32+# SYNOPSIS
33+#
34+# AX_APPEND_FLAG(FLAG, [FLAGS-VARIABLE])
35+#
36+# DESCRIPTION
37+#
38+# FLAG is appended to the FLAGS-VARIABLE shell variable, with a space
39+# added in between.
40+#
41+# If FLAGS-VARIABLE is not specified, the current language's flags (e.g.
42+# CFLAGS) is used. FLAGS-VARIABLE is not changed if it already contains
43+# FLAG. If FLAGS-VARIABLE is unset in the shell, it is set to exactly
44+# FLAG.
45+#
46+# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION.
47+#
48+# LICENSE
49+#
50+# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
51+# Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
52+#
53+# This program is free software: you can redistribute it and/or modify it
54+# under the terms of the GNU General Public License as published by the
55+# Free Software Foundation, either version 3 of the License, or (at your
56+# option) any later version.
57+#
58+# This program is distributed in the hope that it will be useful, but
59+# WITHOUT ANY WARRANTY; without even the implied warranty of
60+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
61+# Public License for more details.
62+#
63+# You should have received a copy of the GNU General Public License along
64+# with this program. If not, see <http://www.gnu.org/licenses/>.
65+#
66+# As a special exception, the respective Autoconf Macro's copyright owner
67+# gives unlimited permission to copy, distribute and modify the configure
68+# scripts that are the output of Autoconf when processing the Macro. You
69+# need not follow the terms of the GNU General Public License when using
70+# or distributing such scripts, even though portions of the text of the
71+# Macro appear in them. The GNU General Public License (GPL) does govern
72+# all other use of the material that constitutes the Autoconf Macro.
73+#
74+# This special exception to the GPL applies to versions of the Autoconf
75+# Macro released by the Autoconf Archive. When you make and distribute a
76+# modified version of the Autoconf Macro, you may extend this special
77+# exception to the GPL to apply to your modified version as well.
78+
79+#serial 6
80+
81+AC_DEFUN([AX_APPEND_FLAG],
82+[dnl
83+AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_SET_IF
84+AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])])
85+AS_VAR_SET_IF(FLAGS,[
86+ AS_CASE([" AS_VAR_GET(FLAGS) "],
87+ [*" $1 "*], [AC_RUN_LOG([: FLAGS already contains $1])],
88+ [
89+ AS_VAR_APPEND(FLAGS,[" $1"])
90+ AC_RUN_LOG([: FLAGS="$FLAGS"])
91+ ])
92+ ],
93+ [
94+ AS_VAR_SET(FLAGS,[$1])
95+ AC_RUN_LOG([: FLAGS="$FLAGS"])
96+ ])
97+AS_VAR_POPDEF([FLAGS])dnl
98+])dnl AX_APPEND_FLAG
99+
100diff --git a/autotools/m4/ax_require_defined.m4 b/autotools/m4/ax_require_defined.m4
101new file mode 100644
102index 0000000..4cb6f3c
103--- /dev/null
104+++ b/autotools/m4/ax_require_defined.m4
105@@ -0,0 +1,38 @@
106+# ===========================================================================
107+# http://www.gnu.org/software/autoconf-archive/ax_require_defined.html
108+# ===========================================================================
109+#
110+# SYNOPSIS
111+#
112+# AX_REQUIRE_DEFINED(MACRO)
113+#
114+# DESCRIPTION
115+#
116+# AX_REQUIRE_DEFINED is a simple helper for making sure other macros have
117+# been defined and thus are available for use. This avoids random issues
118+# where a macro isn't expanded. Instead the configure script emits a
119+# non-fatal:
120+#
121+# ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found
122+#
123+# It's like AC_REQUIRE except it doesn't expand the required macro.
124+#
125+# Here's an example:
126+#
127+# AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
128+#
129+# LICENSE
130+#
131+# Copyright (c) 2014 Mike Frysinger <vapier@gentoo.org>
132+#
133+# Copying and distribution of this file, with or without modification, are
134+# permitted in any medium without royalty provided the copyright notice
135+# and this notice are preserved. This file is offered as-is, without any
136+# warranty.
137+
138+#serial 1
139+
140+AC_DEFUN([AX_REQUIRE_DEFINED], [dnl
141+ m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])])
142+])dnl AX_REQUIRE_DEFINED
143+
144--
1451.9.1
146
diff --git a/meta/recipes-devtools/pax-utils/pax-utils_1.1.4.bb b/meta/recipes-devtools/pax-utils/pax-utils_1.1.5.bb
index 48b342e2e3..a887c037d3 100644
--- a/meta/recipes-devtools/pax-utils/pax-utils_1.1.4.bb
+++ b/meta/recipes-devtools/pax-utils/pax-utils_1.1.5.bb
@@ -8,16 +8,15 @@ LICENSE = "GPLv2+"
8LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" 8LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
9 9
10SRC_URI = "http://gentoo.osuosl.org/distfiles/pax-utils-${PV}.tar.xz \ 10SRC_URI = "http://gentoo.osuosl.org/distfiles/pax-utils-${PV}.tar.xz \
11 file://fix-configure-failure.patch \
12" 11"
13 12
14SRC_URI[md5sum] = "1bfbb5237881f0c5e476b2f7ffcc00d5" 13SRC_URI[md5sum] = "bc3614322eaf88f167a608ae85d6b207"
15SRC_URI[sha256sum] = "796860fbd48c5f811e699e8492dc1110459bad0a62efa8d346b74a4f6f556414" 14SRC_URI[sha256sum] = "2945b3e4df2e0dc95800bfbd3d88ab2243b2ee4ff064bbfc75734f6d9d986a89"
16 15
17RDEPENDS_${PN} += "bash" 16RDEPENDS_${PN} += "bash"
18 17
19do_configure_prepend() { 18do_configure_prepend() {
20 touch ${S}/NEWS ${S}/AUTHORS ${S}/ChangeLog 19 touch ${S}/NEWS ${S}/AUTHORS ${S}/ChangeLog ${S}/README
21} 20}
22 21
23do_install() { 22do_install() {