diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-09-13 09:57:39 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-09-19 18:46:04 +0200 |
commit | 19680760c9a9f3c76b2c6fbbf38d8a34dc64e1ed (patch) | |
tree | 781b36187a63406767c6ded35293d19cf634ebd3 | |
parent | 48f4e6242f2b181f424bb4c3ea162d96ddf9ac2a (diff) | |
download | ptxdist-19680760c9a9f3c76b2c6fbbf38d8a34dc64e1ed.tar.gz ptxdist-19680760c9a9f3c76b2c6fbbf38d8a34dc64e1ed.tar.xz |
acl: version bump 2.2.52 -> 2.2.53
The build-system was moderniced. None of the patches are needed now.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r-- | patches/acl-2.2.52/0001-builddefs-save-C-and-CPPFLAGS-from-configure-and-use.patch | 31 | ||||
-rw-r--r-- | patches/acl-2.2.52/0002-buildmacros-add-tag-CC-to-libtool-invocation.patch | 26 | ||||
-rw-r--r-- | patches/acl-2.2.52/0003-buildmacros-fix-install-with-domain-user-or-domain-u.patch | 229 | ||||
-rw-r--r-- | patches/acl-2.2.52/series | 6 | ||||
-rw-r--r-- | rules/acl.make | 28 | ||||
-rw-r--r-- | rules/host-acl.make | 24 |
6 files changed, 19 insertions, 325 deletions
diff --git a/patches/acl-2.2.52/0001-builddefs-save-C-and-CPPFLAGS-from-configure-and-use.patch b/patches/acl-2.2.52/0001-builddefs-save-C-and-CPPFLAGS-from-configure-and-use.patch deleted file mode 100644 index 4be7388ac..000000000 --- a/patches/acl-2.2.52/0001-builddefs-save-C-and-CPPFLAGS-from-configure-and-use.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Marc Kleine-Budde <mkl@pengutronix.de> -Date: Fri, 8 Jan 2010 20:10:08 +0100 -Subject: [PATCH] builddefs: save C and CPPFLAGS from configure and use them - -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> ---- - include/builddefs.in | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/include/builddefs.in b/include/builddefs.in -index 434ce9559e42..80789b062445 100644 ---- a/include/builddefs.in -+++ b/include/builddefs.in -@@ -11,6 +11,8 @@ DEBUG = @debug_build@ - OPTIMIZER = @opt_build@ - MALLOCLIB = @malloc_lib@ - LOADERFLAGS = @LDFLAGS@ -+CFLAGS = @CFLAGS@ -+CPPFLAGS = @CPPFLAGS@ - - LIBACL = $(TOPDIR)/libacl/libacl.la - LIBATTR = @libattr@ -@@ -85,7 +87,7 @@ GCFLAGS = $(OPTIMIZER) $(DEBUG) -funsigned-char -fno-strict-aliasing -Wall \ - -DPACKAGE=\"$(PKG_NAME)\" -I$(TOPDIR)/include - - # Global, Platform, Local CFLAGS --CFLAGS += $(GCFLAGS) $(PCFLAGS) $(LCFLAGS) -+CFLAGS += $(GCFLAGS) $(PCFLAGS) $(LCFLAGS) $(CPPFLAGS) - - include $(TOPDIR)/include/buildmacros - diff --git a/patches/acl-2.2.52/0002-buildmacros-add-tag-CC-to-libtool-invocation.patch b/patches/acl-2.2.52/0002-buildmacros-add-tag-CC-to-libtool-invocation.patch deleted file mode 100644 index 7bb6811fe..000000000 --- a/patches/acl-2.2.52/0002-buildmacros-add-tag-CC-to-libtool-invocation.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Marc Kleine-Budde <mkl@pengutronix.de> -Date: Fri, 8 Jan 2010 20:10:56 +0100 -Subject: [PATCH] buildmacros: add --tag=CC to libtool invocation - -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> ---- - include/buildmacros | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/buildmacros b/include/buildmacros -index 9e81bb83d609..805ef64d8d57 100644 ---- a/include/buildmacros -+++ b/include/buildmacros -@@ -54,10 +54,10 @@ LIBNAME = $(basename $(LTLIBRARY)) - LTOBJECTS = $(OBJECTS:.o=.lo) - LTVERSION = $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) - --LTLINK = $(LIBTOOL) --mode=link $(CC) -+LTLINK = $(LIBTOOL) --tag=CC --mode=link $(CC) - LTEXEC = $(LIBTOOL) --mode=execute - LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) --LTCOMPILE = $(LIBTOOL) --mode=compile $(CCF) -+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CCF) - - ifeq ($(ENABLE_SHARED),yes) - LTLDFLAGS += -rpath $(PKG_LIB_DIR) diff --git a/patches/acl-2.2.52/0003-buildmacros-fix-install-with-domain-user-or-domain-u.patch b/patches/acl-2.2.52/0003-buildmacros-fix-install-with-domain-user-or-domain-u.patch deleted file mode 100644 index cec5eb2f6..000000000 --- a/patches/acl-2.2.52/0003-buildmacros-fix-install-with-domain-user-or-domain-u.patch +++ /dev/null @@ -1,229 +0,0 @@ -From: Jon Ringle <jon@ringle.org> -Date: Mon, 23 May 2011 10:30:59 -0400 -Subject: [PATCH] buildmacros: fix install with domain\user or "domain user" - -If current user is domain\user the \ gets interpreted as an escape char -resulting in user not found. This also breaks if the user or group contains a -space. - -Enclose "$(PKG_USER)" and "$(PKG_GROUP)" in quotes to fix. - -Signed-off-by: Jon Ringle <jon@ringle.org> -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> ---- - include/buildmacros | 2 +- - include/install-sh | 26 +++++++++++++------------- - install-sh | 26 +++++++++++++------------- - 3 files changed, 27 insertions(+), 27 deletions(-) - -diff --git a/include/buildmacros b/include/buildmacros -index 805ef64d8d57..29e937e077c8 100644 ---- a/include/buildmacros -+++ b/include/buildmacros -@@ -40,7 +40,7 @@ OBJECTS = $(ASFILES:.s=.o) \ - $(LFILES:.l=.o) \ - $(YFILES:%.y=%.tab.o) - --INSTALL = $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP) -+INSTALL = $(TOPDIR)/include/install-sh -o "$(PKG_USER)" -g "$(PKG_GROUP)" - - IMAGES_DIR = $(TOPDIR)/all-images - DIST_DIR = $(TOPDIR)/dist -diff --git a/include/install-sh b/include/install-sh -index 3c9d49be8c68..5fdeb525aab0 100755 ---- a/include/install-sh -+++ b/include/install-sh -@@ -56,7 +56,7 @@ _chown () - { - _st=255 - if [ $# -eq 3 ] ; then -- chown $1:$2 $3 -+ chown "$1":"$2" $3 - _st=$? - if [ $_st -ne 0 ] ; then - if [ $REAL_UID != '0' ] ; then -@@ -115,7 +115,7 @@ fi - - [ -n "$DIST_ROOT" -a $REAL_UID -ne 0 ] && CHOWN=true - --while getopts "Dcm:d:S:o:g:T:" c $* -+while getopts "Dcm:d:S:o:g:T:" c "$@" - do - case $c in - c) -@@ -168,10 +168,10 @@ then - fi - if [ $status -eq 0 ] - then -- $CHOWN $OWNER $GROUP $dir -+ $CHOWN "$OWNER" "$GROUP" $dir - status=$? - fi -- $MANIFEST d $DIRMODE $OWNER $GROUP ${dir#$DIST_ROOT} -+ $MANIFEST d $DIRMODE "$OWNER" "$GROUP" ${dir#$DIST_ROOT} - elif $Sflag - then - # -@@ -217,7 +217,7 @@ then - install_name=$target/$solib - $CP $solib $install_name - status=$? -- $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$solib ${install_name#$DIST_ROOT} -+ $MANIFEST f $FILEMODE "$OWNER" "$GROUP" $HERE/$solib ${install_name#$DIST_ROOT} - break - fi - done -@@ -268,7 +268,7 @@ then - install_name=$target/$old_library - $CP $old_library $install_name - status=$? -- $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$old_library ${install_name#$DIST_ROOT} -+ $MANIFEST f $FILEMODE "$OWNER" "$GROUP" $HERE/$old_library ${install_name#$DIST_ROOT} - ;; - *) - echo "$prog: -T $lt_install invalid" -@@ -281,7 +281,7 @@ then - if [ $status -eq 0 ] - then - $CHMOD $FILEMODE $install_name -- $CHOWN $OWNER $GROUP $install_name -+ $CHOWN "$OWNER" "$GROUP" $install_name - fi - ;; - esac -@@ -310,19 +310,19 @@ else - status=$? - if [ $status -eq 0 ] - then -- $CHOWN $OWNER $GROUP $dir/$f -+ $CHOWN "$OWNER" "$GROUP" $dir/$f - status=$? - fi -- $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$f ${dir#$DIST_ROOT}/$f -+ $MANIFEST f $FILEMODE "$OWNER" "$GROUP" $HERE/$f ${dir#$DIST_ROOT}/$f - else - $CHMOD $FILEMODE $dir - status=$? - if [ $status -eq 0 ] - then -- $CHOWN $OWNER $GROUP $dir -+ $CHOWN "$OWNER" "$GROUP" $dir - status=$? - fi -- $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$dir ${dir#$DIST_ROOT} -+ $MANIFEST f $FILEMODE "$OWNER" "$GROUP" $HERE/$dir ${dir#$DIST_ROOT} - fi - fi - else -@@ -352,10 +352,10 @@ else - status=$? - if [ $status -eq 0 ] - then -- $CHOWN $OWNER $GROUP $dir/$f -+ $CHOWN "$OWNER" "$GROUP" $dir/$f - status=$? - fi -- $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$f ${dir#$DIST_ROOT}/$f -+ $MANIFEST f $FILEMODE "$OWNER" "$GROUP" $HERE/$f ${dir#$DIST_ROOT}/$f - fi - [ $status -ne 0 ] && break - done -diff --git a/install-sh b/install-sh -index 3c9d49be8c68..5fdeb525aab0 100755 ---- a/install-sh -+++ b/install-sh -@@ -56,7 +56,7 @@ _chown () - { - _st=255 - if [ $# -eq 3 ] ; then -- chown $1:$2 $3 -+ chown "$1":"$2" $3 - _st=$? - if [ $_st -ne 0 ] ; then - if [ $REAL_UID != '0' ] ; then -@@ -115,7 +115,7 @@ fi - - [ -n "$DIST_ROOT" -a $REAL_UID -ne 0 ] && CHOWN=true - --while getopts "Dcm:d:S:o:g:T:" c $* -+while getopts "Dcm:d:S:o:g:T:" c "$@" - do - case $c in - c) -@@ -168,10 +168,10 @@ then - fi - if [ $status -eq 0 ] - then -- $CHOWN $OWNER $GROUP $dir -+ $CHOWN "$OWNER" "$GROUP" $dir - status=$? - fi -- $MANIFEST d $DIRMODE $OWNER $GROUP ${dir#$DIST_ROOT} -+ $MANIFEST d $DIRMODE "$OWNER" "$GROUP" ${dir#$DIST_ROOT} - elif $Sflag - then - # -@@ -217,7 +217,7 @@ then - install_name=$target/$solib - $CP $solib $install_name - status=$? -- $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$solib ${install_name#$DIST_ROOT} -+ $MANIFEST f $FILEMODE "$OWNER" "$GROUP" $HERE/$solib ${install_name#$DIST_ROOT} - break - fi - done -@@ -268,7 +268,7 @@ then - install_name=$target/$old_library - $CP $old_library $install_name - status=$? -- $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$old_library ${install_name#$DIST_ROOT} -+ $MANIFEST f $FILEMODE "$OWNER" "$GROUP" $HERE/$old_library ${install_name#$DIST_ROOT} - ;; - *) - echo "$prog: -T $lt_install invalid" -@@ -281,7 +281,7 @@ then - if [ $status -eq 0 ] - then - $CHMOD $FILEMODE $install_name -- $CHOWN $OWNER $GROUP $install_name -+ $CHOWN "$OWNER" "$GROUP" $install_name - fi - ;; - esac -@@ -310,19 +310,19 @@ else - status=$? - if [ $status -eq 0 ] - then -- $CHOWN $OWNER $GROUP $dir/$f -+ $CHOWN "$OWNER" "$GROUP" $dir/$f - status=$? - fi -- $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$f ${dir#$DIST_ROOT}/$f -+ $MANIFEST f $FILEMODE "$OWNER" "$GROUP" $HERE/$f ${dir#$DIST_ROOT}/$f - else - $CHMOD $FILEMODE $dir - status=$? - if [ $status -eq 0 ] - then -- $CHOWN $OWNER $GROUP $dir -+ $CHOWN "$OWNER" "$GROUP" $dir - status=$? - fi -- $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$dir ${dir#$DIST_ROOT} -+ $MANIFEST f $FILEMODE "$OWNER" "$GROUP" $HERE/$dir ${dir#$DIST_ROOT} - fi - fi - else -@@ -352,10 +352,10 @@ else - status=$? - if [ $status -eq 0 ] - then -- $CHOWN $OWNER $GROUP $dir/$f -+ $CHOWN "$OWNER" "$GROUP" $dir/$f - status=$? - fi -- $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$f ${dir#$DIST_ROOT}/$f -+ $MANIFEST f $FILEMODE "$OWNER" "$GROUP" $HERE/$f ${dir#$DIST_ROOT}/$f - fi - [ $status -ne 0 ] && break - done diff --git a/patches/acl-2.2.52/series b/patches/acl-2.2.52/series deleted file mode 100644 index 6816cae02..000000000 --- a/patches/acl-2.2.52/series +++ /dev/null @@ -1,6 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-builddefs-save-C-and-CPPFLAGS-from-configure-and-use.patch -0002-buildmacros-add-tag-CC-to-libtool-invocation.patch -0003-buildmacros-fix-install-with-domain-user-or-domain-u.patch -# 842c7b9ceac477f4c23e59ce8ade0f20 - git-ptx-patches magic diff --git a/rules/acl.make b/rules/acl.make index c175e5313..daa5837c9 100644 --- a/rules/acl.make +++ b/rules/acl.make @@ -14,12 +14,12 @@ PACKAGES-$(PTXCONF_ACL) += acl # # Paths and names # -ACL_VERSION := 2.2.52 -ACL_MD5 := a61415312426e9c2212bd7dc7929abda +ACL_VERSION := 2.2.53 +ACL_MD5 := 007aabf1dbb550bcddde52a244cd1070 ACL := acl-$(ACL_VERSION) ACL_SUFFIX := tar.gz -ACL_URL := http://download.savannah.gnu.org/releases/acl/$(ACL).src.$(ACL_SUFFIX) -ACL_SOURCE := $(SRCDIR)/$(ACL).src.$(ACL_SUFFIX) +ACL_URL := http://download.savannah.gnu.org/releases/acl/$(ACL).$(ACL_SUFFIX) +ACL_SOURCE := $(SRCDIR)/$(ACL).$(ACL_SUFFIX) ACL_DIR := $(BUILDDIR)/$(ACL) ACL_LICENSE := LGPL-2.1-or-later ACL_LICENSE_FILES:= file://doc/COPYING.LGPL;md5=9e9a206917f8af112da634ce3ab41764 @@ -27,27 +27,21 @@ ifdef PTXCONF_ACL_TOOLS ACL_LICENSE+= AND GPL-2.0.or-later ACL_LICENSE_FILES+= file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249 endif + # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -ACL_PATH := PATH=$(CROSS_PATH) -ACL_ENV := $(CROSS_ENV) - -ACL_INSTALL_OPT := \ - DIST_ROOT=$(ACL_PKGDIR) \ - install \ - install-lib \ - install-dev - # # autoconf # -ACL_AUTOCONF := \ +ACL_CONF_TOOL := autoconf +ACL_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ - --libexecdir=/usr/lib \ - --enable-shared \ - --$(call ptx/endis, PTXCONF_ACL_GETTEXT)-gettext + $(GLOBAL_LARGE_FILE_OPTION) \ + --disable-nls \ + --disable-rpath \ + --disable-debug # ---------------------------------------------------------------------------- # Target-Install diff --git a/rules/host-acl.make b/rules/host-acl.make index 33e89f1bb..12e2e39c9 100644 --- a/rules/host-acl.make +++ b/rules/host-acl.make @@ -16,22 +16,14 @@ HOST_PACKAGES-$(PTXCONF_HOST_ACL) += host-acl # Prepare # ---------------------------------------------------------------------------- -HOST_ACL_ENV := \ - $(HOST_ENV) \ - ac_cv_path_MSGFMT=: \ - ac_cv_path_MSGMERGE=: \ - ac_cv_path_XGETTEXT=: - -# don't use := here -HOST_ACL_INSTALL_OPT = \ - DIST_ROOT=$(HOST_ACL_PKGDIR) \ - install \ - install-lib \ - install-dev - -HOST_ACL_AUTOCONF := \ +# +# autoconf +# +HOST_ACL_CONF_TOOL := autoconf +HOST_ACL_CONF_OPT := \ $(HOST_AUTOCONF) \ - --libexecdir=/lib \ - --enable-shared + --disable-nls \ + --disable-rpath \ + --disable-debug # vim: syntax=make |