From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yann E. MORIN Date: Thu, 28 Jun 2018 22:12:28 +0200 Subject: [Buildroot] [PATCH 1/1] package/attr: bump to version 2.4.48 In-Reply-To: <20180628142953.12048-1-ghn@certi.org.br> References: <20180628142953.12048-1-ghn@certi.org.br> Message-ID: <20180628201228.GA23513@scaer> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net Gustavo, All, On 2018-06-28 11:29 -0300, Gustavo Henrique Nihei spake thusly: > attr had its build system modernized in this release, making the package > build/install like every other autotools package. Patches 0001 and 0004 > are no longer needed. Patches 0002 and 0003 are already upstream in > commit IDs 667137acaffb8d0cc62b47821a67a52ba0637d5c and > 92247401984dd9a80d9d0c8c030692323f980678, respectively. This is not enough, becaus the latest attr version no longer installs its legacy xattr.h header, as it has been provided by the C libray for ages now. I initially sent a 6-patch series, nit sure why it's not in Patchwork anymore: https://git.buildroot.org/~ymorin/git/buildroot/log/?h=yem/bump-attr So, no, bumping acl and attr is not enough, because it breaks at least three packages: xoriso lua-flu stress-ng which are all three fixed in my series. I'll try to respin it in a moment... Regards, Yann E. MORIN. > Signed-off-by: Gustavo Henrique Nihei > --- > .../attr/0001-support-static-installation.patch | 29 ---------- > .../0002-avoid-glibc-specific-decls-defines.patch | 37 ------------ > package/attr/0003-portability-fixes.patch | 37 ------------ > ...-all-use-install-1-to-install-executables.patch | 67 ---------------------- > package/attr/attr.hash | 2 +- > package/attr/attr.mk | 35 +---------- > 6 files changed, 3 insertions(+), 204 deletions(-) > delete mode 100644 package/attr/0001-support-static-installation.patch > delete mode 100644 package/attr/0002-avoid-glibc-specific-decls-defines.patch > delete mode 100644 package/attr/0003-portability-fixes.patch > delete mode 100644 package/attr/0004-all-use-install-1-to-install-executables.patch > > diff --git a/package/attr/0001-support-static-installation.patch b/package/attr/0001-support-static-installation.patch > deleted file mode 100644 > index 87858ac75e..0000000000 > --- a/package/attr/0001-support-static-installation.patch > +++ /dev/null > @@ -1,29 +0,0 @@ > -Support installation of .a file when doing static linking > - > -When doing static linking (i.e ENABLE_SHARED != yes), the attr build > -logic wasn't installing any library at all, not even the .a file which > -is needed for static linking. This patch fixes that. > - > -Signed-off-by: Thomas Petazzoni > - > -Index: b/include/buildmacros > -=================================================================== > ---- a/include/buildmacros > -+++ b/include/buildmacros > -@@ -97,7 +97,15 @@ > - > - INSTALL_LTLIB_STATIC = \ > - cd $(TOPDIR)/$(LIBNAME)/.libs; \ > -- ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); > -+ ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \ > -+ ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).la $(PKG_DEVLIB_DIR); \ > -+ ../$(INSTALL) -m 644 $(LIBNAME).la $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \ > -+ ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ > -+ ../$(INSTALL) -T so_base $(LIBNAME).la $(PKG_LIB_DIR); \ > -+ if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \ > -+ ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \ > -+ ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \ > -+ fi > - > - INSTALL_MAN = \ > - @for d in $(MAN_PAGES); do \ > diff --git a/package/attr/0002-avoid-glibc-specific-decls-defines.patch b/package/attr/0002-avoid-glibc-specific-decls-defines.patch > deleted file mode 100644 > index 8c71678cf4..0000000000 > --- a/package/attr/0002-avoid-glibc-specific-decls-defines.patch > +++ /dev/null > @@ -1,37 +0,0 @@ > -From 667137acaffb8d0cc62b47821a67a52ba0637d5c Mon Sep 17 00:00:00 2001 > -From: Mike Frysinger > -Date: Fri, 10 Jan 2014 13:56:37 +0000 > -Subject: avoid glibc-specific DECLS defines > - > -This matches what we do in all the other headers. > - > -Signed-off-by: Thomas Petazzoni > ---- > -diff --git a/include/xattr.h b/include/xattr.h > -index 70a84be..070d7c5 100644 > ---- a/include/xattr.h > -+++ b/include/xattr.h > -@@ -30,8 +30,9 @@ > - #define XATTR_CREATE 0x1 /* set value, fail if attr already exists */ > - #define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */ > - > -- > --__BEGIN_DECLS > -+#ifdef __cplusplus > -+extern "C" { > -+#endif > - > - extern int setxattr (const char *__path, const char *__name, > - const void *__value, size_t __size, int __flags) __THROW; > -@@ -58,6 +59,8 @@ extern int removexattr (const char *__path, const char *__name) __THROW; > - extern int lremovexattr (const char *__path, const char *__name) __THROW; > - extern int fremovexattr (int __filedes, const char *__name) __THROW; > - > --__END_DECLS > -+#ifdef __cplusplus > -+} > -+#endif > - > - #endif /* __XATTR_H__ */ > --- > -cgit v0.9.0.2 > diff --git a/package/attr/0003-portability-fixes.patch b/package/attr/0003-portability-fixes.patch > deleted file mode 100644 > index c5dc8c865b..0000000000 > --- a/package/attr/0003-portability-fixes.patch > +++ /dev/null > @@ -1,37 +0,0 @@ > -From 92247401984dd9a80d9d0c8c030692323f980678 Mon Sep 17 00:00:00 2001 > -From: Emmanuel Dreyfus > -Date: Mon, 30 Jun 2014 13:06:05 +0000 > -Subject: Portability fixes > - > -- is Linux specific > -- Define __THROW for non glibc based systems > - > -Signed-off-by: Thomas Petazzoni > ---- > -(limited to 'include/xattr.h') > - > -diff --git a/include/xattr.h b/include/xattr.h > -index 070d7c5..fd1f268 100644 > ---- a/include/xattr.h > -+++ b/include/xattr.h > -@@ -20,7 +20,18 @@ > - #ifndef __XATTR_H__ > - #define __XATTR_H__ > - > -+#if defined(linux) > - #include > -+#endif > -+ > -+/* Portability non glibc c++ build systems */ > -+#ifndef __THROW > -+# if defined __cplusplus > -+# define __THROW throw () > -+# else > -+# define __THROW > -+# endif > -+#endif > - > - #include > - #ifndef ENOATTR > --- > -cgit v0.9.0.2 > diff --git a/package/attr/0004-all-use-install-1-to-install-executables.patch b/package/attr/0004-all-use-install-1-to-install-executables.patch > deleted file mode 100644 > index ef59bb797c..0000000000 > --- a/package/attr/0004-all-use-install-1-to-install-executables.patch > +++ /dev/null > @@ -1,67 +0,0 @@ > -From 4187e60ab52cac3ed36036a354977310dab68dcb Mon Sep 17 00:00:00 2001 > -From: "Yann E. MORIN" > -Date: Tue, 8 May 2018 15:16:10 +0200 > -Subject: [PATCH] all: use install(1) to install executables > - > -When the destination file already exists, the current install script > -will overwrite it with the new executable. > - > -However, when the existing executable is a symlink or hardlink to > -something else, like busybox, this effectively overwrites that something > -with the new executable, and thus replaces busybox and all its applets > -with the code for either of the three commands. > - > -We fix that by simply calling install(1). install(1) is sufficiently > -widespread that we don't bother checking for it, as this is just a > -workaround while waiting for the version bump that will eventually fix > -it for good. > - > -Signed-off-by: "Yann E. MORIN" > ---- > - attr/Makefile | 4 ++-- > - getfattr/Makefile | 4 ++-- > - setfattr/Makefile | 4 ++-- > - 3 files changed, 6 insertions(+), 6 deletions(-) > - > -diff --git a/attr/Makefile b/attr/Makefile > -index 1c467e8..326dd7e 100644 > ---- a/attr/Makefile > -+++ b/attr/Makefile > -@@ -29,6 +29,6 @@ default: $(LTCOMMAND) > - include $(BUILDRULES) > - > - install: default > -- $(INSTALL) -m 755 -d $(PKG_BIN_DIR) > -- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) > -+ install -D -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)/$(LTCOMMAND) > -+ > - install-dev install-lib: > -diff --git a/getfattr/Makefile b/getfattr/Makefile > -index 91d3df2..f913172 100644 > ---- a/getfattr/Makefile > -+++ b/getfattr/Makefile > -@@ -30,6 +30,6 @@ default: $(LTCOMMAND) > - include $(BUILDRULES) > - > - install: default > -- $(INSTALL) -m 755 -d $(PKG_BIN_DIR) > -- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) > -+ install -D -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)/$(LTCOMMAND) > -+ > - install-dev install-lib: > -diff --git a/setfattr/Makefile b/setfattr/Makefile > -index d55461b..26dc5d8 100644 > ---- a/setfattr/Makefile > -+++ b/setfattr/Makefile > -@@ -30,6 +30,6 @@ default: $(LTCOMMAND) > - include $(BUILDRULES) > - > - install: default > -- $(INSTALL) -m 755 -d $(PKG_BIN_DIR) > -- $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) > -+ install -D -m 755 $(LTCOMMAND) $(PKG_BIN_DIR)/$(LTCOMMAND) > -+ > - install-dev install-lib: > --- > -2.14.1 > - > diff --git a/package/attr/attr.hash b/package/attr/attr.hash > index d2d1c2ed50..17c049bd01 100644 > --- a/package/attr/attr.hash > +++ b/package/attr/attr.hash > @@ -1,2 +1,2 @@ > # Locally calculated after checking pgp signature > -sha256 25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859 attr-2.4.47.src.tar.gz > +sha256 5ead72b358ec709ed00bbf7a9eaef1654baad937c001c044fe8b74c57f5324e7 attr-2.4.48.tar.gz > diff --git a/package/attr/attr.mk b/package/attr/attr.mk > index 8d250608b7..a558f4c742 100644 > --- a/package/attr/attr.mk > +++ b/package/attr/attr.mk > @@ -4,43 +4,12 @@ > # > ################################################################################ > > -ATTR_VERSION = 2.4.47 > -ATTR_SOURCE = attr-$(ATTR_VERSION).src.tar.gz > +ATTR_VERSION = 2.4.48 > ATTR_SITE = http://download.savannah.gnu.org/releases/attr > ATTR_INSTALL_STAGING = YES > -ATTR_CONF_OPTS = --enable-gettext=no > -HOST_ATTR_CONF_OPTS = --enable-gettext=no > +ATTR_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) > ATTR_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) > ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL > > -# While the configuration system uses autoconf, the Makefiles are > -# hand-written and do not use automake. Therefore, we have to hack > -# around their deficiencies by passing installation paths. > -ATTR_INSTALL_STAGING_OPTS = \ > - prefix=$(STAGING_DIR)/usr \ > - exec_prefix=$(STAGING_DIR)/usr \ > - PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib \ > - install-dev install-lib > - > -ATTR_INSTALL_TARGET_OPTS = \ > - prefix=$(TARGET_DIR)/usr \ > - exec_prefix=$(TARGET_DIR)/usr \ > - install install-lib > - > -HOST_ATTR_INSTALL_OPTS = \ > - prefix=$(HOST_DIR) \ > - exec_prefix=$(HOST_DIR) \ > - install-dev install-lib > - > -# The libdir variable in libattr.la is empty, so let's fix it. This is > -# probably due to attr not using automake, and not doing fully the > -# right thing with libtool. > -define ATTR_FIX_LIBTOOL_LA_LIBDIR > - $(SED) "s,libdir=.*,libdir='$(STAGING_DIR)'," \ > - $(STAGING_DIR)/usr/lib/libattr.la > -endef > - > -ATTR_POST_INSTALL_STAGING_HOOKS += ATTR_FIX_LIBTOOL_LA_LIBDIR > - > $(eval $(autotools-package)) > $(eval $(host-autotools-package)) > -- > 2.16.2.windows.1 > > _______________________________________________ > buildroot mailing list > buildroot at busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'