From 14833280276c083a60d3d6fdbcc5e25eb2456c48 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 14 Nov 2016 13:19:28 +0000 Subject: acl: drop in instead of patching configure.ac Signed-off-by: Ross Burton --- .../attr/acl/add-missing-configure.ac.patch | 59 ---------------------- meta/recipes-support/attr/acl/configure.ac | 49 ++++++++++++++++++ meta/recipes-support/attr/acl_2.2.52.bb | 4 +- 3 files changed, 51 insertions(+), 61 deletions(-) delete mode 100644 meta/recipes-support/attr/acl/add-missing-configure.ac.patch create mode 100644 meta/recipes-support/attr/acl/configure.ac (limited to 'meta/recipes-support') 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 @@ -Upstream-Status: Backport [configure.ac is missing from tarball] - -Signed-off-by: Saul Wold - -Index: acl-2.2.52/configure.ac -=================================================================== ---- /dev/null -+++ acl-2.2.52/configure.ac -@@ -0,0 +1,50 @@ -+ -+# Copyright (C) 2009 Andreas Gruenbacher -+# -+# This program is free software: you can redistribute it and/or modify it -+# under the terms of the GNU General Public License as published by -+# the Free Software Foundation, either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program. If not, see . -+# -+AC_INIT(include/acl.h) -+AC_CONFIG_AUX_DIR([.]) -+AC_CONFIG_MACRO_DIR([m4]) -+AC_CONFIG_HEADER(include/config.h) -+AC_PREFIX_DEFAULT(/usr) -+ -+AC_PROG_LIBTOOL -+ -+AC_ARG_ENABLE(shared, -+[ --enable-shared=[yes/no] Enable use of shared libraries [default=yes]],, -+ enable_shared=yes) -+AC_SUBST(enable_shared) -+ -+AC_ARG_ENABLE(gettext, -+[ --enable-gettext=[yes/no] Enable alternate language support [default=yes]],, -+ enable_gettext=yes) -+AC_SUBST(enable_gettext) -+ -+AC_ARG_ENABLE(lib64, -+[ --enable-lib64=[yes/no] Enable lib64 support [default=no]],, -+ enable_lib64=no) -+AC_SUBST(enable_lib64) -+ -+AC_PACKAGE_GLOBALS(acl) -+AC_PACKAGE_UTILITIES(acl) -+AC_PACKAGE_NEED_ATTR_XATTR_H -+AC_PACKAGE_NEED_ATTR_ERROR_H -+AC_MULTILIB($enable_lib64) -+AC_PACKAGE_NEED_GETXATTR_LIBATTR -+AC_MANUAL_FORMAT -+ -+AC_FUNC_GCC_VISIBILITY -+ -+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 @@ +# Copyright (C) 2009 Andreas Gruenbacher +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +AC_INIT(include/acl.h) +AC_CONFIG_AUX_DIR([.]) +AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_HEADER(include/config.h) +AC_PREFIX_DEFAULT(/usr) + +AC_PROG_LIBTOOL + +AC_ARG_ENABLE(shared, +[ --enable-shared=[yes/no] Enable use of shared libraries [default=yes]],, + enable_shared=yes) +AC_SUBST(enable_shared) + +AC_ARG_ENABLE(gettext, +[ --enable-gettext=[yes/no] Enable alternate language support [default=yes]],, + enable_gettext=yes) +AC_SUBST(enable_gettext) + +AC_ARG_ENABLE(lib64, +[ --enable-lib64=[yes/no] Enable lib64 support [default=no]],, + enable_lib64=no) +AC_SUBST(enable_lib64) + +AC_PACKAGE_GLOBALS(acl) +AC_PACKAGE_UTILITIES(acl) +AC_PACKAGE_NEED_ATTR_XATTR_H +AC_PACKAGE_NEED_ATTR_ERROR_H +AC_MULTILIB($enable_lib64) +AC_PACKAGE_NEED_GETXATTR_LIBATTR +AC_MANUAL_FORMAT + +AC_FUNC_GCC_VISIBILITY + +AC_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 \ DEPENDS = "attr" SRC_URI = "${SAVANNAH_GNU_MIRROR}/acl/${BP}.src.tar.gz \ + file://configure.ac;subdir=${S} \ file://run-ptest \ file://acl-fix-the-order-of-expected-output-of-getfacl.patch \ file://test-fix-insufficient-quoting-of.patch \ file://test-fixups-on-SELinux-machines-for-root-testcases.patch \ - file://test-fix-directory-permissions.patch \ - file://add-missing-configure.ac.patch" + file://test-fix-directory-permissions.patch" SRC_URI[md5sum] = "a61415312426e9c2212bd7dc7929abda" SRC_URI[sha256sum] = "179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23" -- cgit 1.2.3-korg