summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-11-14 13:19:28 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-31 14:43:01 +0000
commit72f3e9083754f11bab79f7ac9e2919bc402b784d (patch)
treef33c9413f0830ac0fdf1c352caafe7c27d8c67a6
parent5ffd69e25711eb0a64aaf0b2934357d79117e1e8 (diff)
downloadpoky-72f3e9083754f11bab79f7ac9e2919bc402b784d.tar.gz
acl: drop in instead of patching configure.ac
(From OE-Core rev: 14833280276c083a60d3d6fdbcc5e25eb2456c48) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/attr/acl/add-missing-configure.ac.patch59
-rw-r--r--meta/recipes-support/attr/acl/configure.ac49
-rw-r--r--meta/recipes-support/attr/acl_2.2.52.bb4
3 files changed, 51 insertions, 61 deletions
diff --git a/meta/recipes-support/attr/acl/add-missing-configure.ac.patch b/meta/recipes-support/attr/acl/add-missing-configure.ac.patch
deleted file mode 100644
index eb6979fa3c..0000000000
--- a/meta/recipes-support/attr/acl/add-missing-configure.ac.patch
+++ /dev/null
@@ -1,59 +0,0 @@
1Upstream-Status: Backport [configure.ac is missing from tarball]
2
3Signed-off-by: Saul Wold <sgw@linux.intel.com>
4
5Index: acl-2.2.52/configure.ac
6===================================================================
7--- /dev/null
8+++ acl-2.2.52/configure.ac
9@@ -0,0 +1,50 @@
10+
11+# Copyright (C) 2009 Andreas Gruenbacher <agruen@suse.de>
12+#
13+# This program is free software: you can redistribute it and/or modify it
14+# under the terms of the GNU General Public License as published by
15+# the Free Software Foundation, either version 2 of the License, or
16+# (at your option) any later version.
17+#
18+# This program is distributed in the hope that it will be useful,
19+# but WITHOUT ANY WARRANTY; without even the implied warranty of
20+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21+# GNU General Public License for more details.
22+#
23+# You should have received a copy of the GNU General Public License
24+# along with this program. If not, see <http://www.gnu.org/licenses/>.
25+#
26+AC_INIT(include/acl.h)
27+AC_CONFIG_AUX_DIR([.])
28+AC_CONFIG_MACRO_DIR([m4])
29+AC_CONFIG_HEADER(include/config.h)
30+AC_PREFIX_DEFAULT(/usr)
31+
32+AC_PROG_LIBTOOL
33+
34+AC_ARG_ENABLE(shared,
35+[ --enable-shared=[yes/no] Enable use of shared libraries [default=yes]],,
36+ enable_shared=yes)
37+AC_SUBST(enable_shared)
38+
39+AC_ARG_ENABLE(gettext,
40+[ --enable-gettext=[yes/no] Enable alternate language support [default=yes]],,
41+ enable_gettext=yes)
42+AC_SUBST(enable_gettext)
43+
44+AC_ARG_ENABLE(lib64,
45+[ --enable-lib64=[yes/no] Enable lib64 support [default=no]],,
46+ enable_lib64=no)
47+AC_SUBST(enable_lib64)
48+
49+AC_PACKAGE_GLOBALS(acl)
50+AC_PACKAGE_UTILITIES(acl)
51+AC_PACKAGE_NEED_ATTR_XATTR_H
52+AC_PACKAGE_NEED_ATTR_ERROR_H
53+AC_MULTILIB($enable_lib64)
54+AC_PACKAGE_NEED_GETXATTR_LIBATTR
55+AC_MANUAL_FORMAT
56+
57+AC_FUNC_GCC_VISIBILITY
58+
59+AC_OUTPUT(include/builddefs)
diff --git a/meta/recipes-support/attr/acl/configure.ac b/meta/recipes-support/attr/acl/configure.ac
new file mode 100644
index 0000000000..7af2e8d886
--- /dev/null
+++ b/meta/recipes-support/attr/acl/configure.ac
@@ -0,0 +1,49 @@
1# Copyright (C) 2009 Andreas Gruenbacher <agruen@suse.de>
2#
3# This program is free software: you can redistribute it and/or modify it
4# under the terms of the GNU General Public License as published by
5# the Free Software Foundation, either version 2 of the License, or
6# (at your option) any later version.
7#
8# This program is distributed in the hope that it will be useful,
9# but WITHOUT ANY WARRANTY; without even the implied warranty of
10# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11# GNU General Public License for more details.
12#
13# You should have received a copy of the GNU General Public License
14# along with this program. If not, see <http://www.gnu.org/licenses/>.
15#
16AC_INIT(include/acl.h)
17AC_CONFIG_AUX_DIR([.])
18AC_CONFIG_MACRO_DIR([m4])
19AC_CONFIG_HEADER(include/config.h)
20AC_PREFIX_DEFAULT(/usr)
21
22AC_PROG_LIBTOOL
23
24AC_ARG_ENABLE(shared,
25[ --enable-shared=[yes/no] Enable use of shared libraries [default=yes]],,
26 enable_shared=yes)
27AC_SUBST(enable_shared)
28
29AC_ARG_ENABLE(gettext,
30[ --enable-gettext=[yes/no] Enable alternate language support [default=yes]],,
31 enable_gettext=yes)
32AC_SUBST(enable_gettext)
33
34AC_ARG_ENABLE(lib64,
35[ --enable-lib64=[yes/no] Enable lib64 support [default=no]],,
36 enable_lib64=no)
37AC_SUBST(enable_lib64)
38
39AC_PACKAGE_GLOBALS(acl)
40AC_PACKAGE_UTILITIES(acl)
41AC_PACKAGE_NEED_ATTR_XATTR_H
42AC_PACKAGE_NEED_ATTR_ERROR_H
43AC_MULTILIB($enable_lib64)
44AC_PACKAGE_NEED_GETXATTR_LIBATTR
45AC_MANUAL_FORMAT
46
47AC_FUNC_GCC_VISIBILITY
48
49AC_OUTPUT(include/builddefs)
diff --git a/meta/recipes-support/attr/acl_2.2.52.bb b/meta/recipes-support/attr/acl_2.2.52.bb
index 4b1ebe0d02..9ab5853d53 100644
--- a/meta/recipes-support/attr/acl_2.2.52.bb
+++ b/meta/recipes-support/attr/acl_2.2.52.bb
@@ -11,12 +11,12 @@ LIC_FILES_CHKSUM = "file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249 \
11DEPENDS = "attr" 11DEPENDS = "attr"
12 12
13SRC_URI = "${SAVANNAH_GNU_MIRROR}/acl/${BP}.src.tar.gz \ 13SRC_URI = "${SAVANNAH_GNU_MIRROR}/acl/${BP}.src.tar.gz \
14 file://configure.ac;subdir=${S} \
14 file://run-ptest \ 15 file://run-ptest \
15 file://acl-fix-the-order-of-expected-output-of-getfacl.patch \ 16 file://acl-fix-the-order-of-expected-output-of-getfacl.patch \
16 file://test-fix-insufficient-quoting-of.patch \ 17 file://test-fix-insufficient-quoting-of.patch \
17 file://test-fixups-on-SELinux-machines-for-root-testcases.patch \ 18 file://test-fixups-on-SELinux-machines-for-root-testcases.patch \
18 file://test-fix-directory-permissions.patch \ 19 file://test-fix-directory-permissions.patch"
19 file://add-missing-configure.ac.patch"
20 20
21SRC_URI[md5sum] = "a61415312426e9c2212bd7dc7929abda" 21SRC_URI[md5sum] = "a61415312426e9c2212bd7dc7929abda"
22SRC_URI[sha256sum] = "179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23" 22SRC_URI[sha256sum] = "179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23"