mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-27 21:26:36 +00:00
package/attr: bump version
The current version of attr uses a canned custom buildsystem, that is borked in quite a few ways (no support for static, overwrites destination files without unlinking...) There has been a release recently-ish, with a complete overhaul of the buildsystem. We can now drop all our patches. The option to disable NLS has changed, so update accordingly. Fixes: #10986 Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Yegor Yefremov <yegorslists@googlemail.com> [Arnout: use the original SITE instead of a specific mirror] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Yann E. MORIN
Arnout Vandecappelle (Essensium/Mind)
parent
a37657f44e
commit
b02616cff4
@ -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 <thomas.petazzoni@free-electrons.com>
|
|
||||||
|
|
||||||
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 \
|
|
||||||
@ -1,37 +0,0 @@
|
|||||||
From 667137acaffb8d0cc62b47821a67a52ba0637d5c Mon Sep 17 00:00:00 2001
|
|
||||||
From: Mike Frysinger <vapier@gentoo.org>
|
|
||||||
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 <thomas.petazzoni@free-electrons.com>
|
|
||||||
---
|
|
||||||
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
|
|
||||||
@ -1,37 +0,0 @@
|
|||||||
From 92247401984dd9a80d9d0c8c030692323f980678 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Emmanuel Dreyfus <manu@netbsd.org>
|
|
||||||
Date: Mon, 30 Jun 2014 13:06:05 +0000
|
|
||||||
Subject: Portability fixes
|
|
||||||
|
|
||||||
- <features.h> is Linux specific
|
|
||||||
- Define __THROW for non glibc based systems
|
|
||||||
|
|
||||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
||||||
---
|
|
||||||
(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 <features.h>
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
+/* Portability non glibc c++ build systems */
|
|
||||||
+#ifndef __THROW
|
|
||||||
+# if defined __cplusplus
|
|
||||||
+# define __THROW throw ()
|
|
||||||
+# else
|
|
||||||
+# define __THROW
|
|
||||||
+# endif
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#include <errno.h>
|
|
||||||
#ifndef ENOATTR
|
|
||||||
--
|
|
||||||
cgit v0.9.0.2
|
|
||||||
@ -1,67 +0,0 @@
|
|||||||
From 4187e60ab52cac3ed36036a354977310dab68dcb Mon Sep 17 00:00:00 2001
|
|
||||||
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
|
||||||
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" <yann.morin.1998@free.fr>
|
|
||||||
---
|
|
||||||
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
|
|
||||||
|
|
||||||
@ -1,2 +1,2 @@
|
|||||||
# Locally calculated after checking pgp signature
|
# Locally calculated after checking pgp signature
|
||||||
sha256 25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859 attr-2.4.47.src.tar.gz
|
sha256 5ead72b358ec709ed00bbf7a9eaef1654baad937c001c044fe8b74c57f5324e7 attr-2.4.48.tar.gz
|
||||||
|
|||||||
@ -4,43 +4,15 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
ATTR_VERSION = 2.4.47
|
ATTR_VERSION = 2.4.48
|
||||||
ATTR_SOURCE = attr-$(ATTR_VERSION).src.tar.gz
|
|
||||||
ATTR_SITE = http://download.savannah.gnu.org/releases/attr
|
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_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries)
|
ATTR_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries)
|
||||||
ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL
|
ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL
|
||||||
|
|
||||||
# While the configuration system uses autoconf, the Makefiles are
|
ATTR_INSTALL_STAGING = YES
|
||||||
# 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 = \
|
ATTR_CONF_OPTS = --disable-nls
|
||||||
prefix=$(TARGET_DIR)/usr \
|
HOST_ATTR_CONF_OPTS = --disable-nls
|
||||||
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 $(autotools-package))
|
||||||
$(eval $(host-autotools-package))
|
$(eval $(host-autotools-package))
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user