Compare commits
16 Commits
ee4e69cc35
...
1991bfb814
Author | SHA1 | Date |
---|---|---|
Michael Pratt | 1991bfb814 | |
Michael Pratt | ddb7177c57 | |
Michael Pratt | 20ed56ec8b | |
Michael Pratt | 43be319823 | |
Michael Pratt | 7a4df7825e | |
Tony Ambardar | b6f025b424 | |
Michael Pratt | 44625e9d95 | |
Michael Pratt | 0489436506 | |
Michael Pratt | 41bc16dcc4 | |
Tony Ambardar | 098bde1f3e | |
Michael Pratt | eb726c90be | |
Michael Pratt | 5ade7ee60e | |
Tony Ambardar | 4de8c0e1d8 | |
Michael Pratt | cdd56fc893 | |
Michael Pratt | 5a028a8d73 | |
Tim Lunn | 99eb0d0e33 |
|
@ -26,7 +26,7 @@ HOST_STAMP_CONFIGURED:=$(HOST_BUILD_DIR)/.configured
|
||||||
HOST_STAMP_BUILT:=$(HOST_BUILD_DIR)/.built
|
HOST_STAMP_BUILT:=$(HOST_BUILD_DIR)/.built
|
||||||
HOST_BUILD_PREFIX?=$(if $(IS_PACKAGE_BUILD),$(STAGING_DIR_HOSTPKG),$(STAGING_DIR_HOST))
|
HOST_BUILD_PREFIX?=$(if $(IS_PACKAGE_BUILD),$(STAGING_DIR_HOSTPKG),$(STAGING_DIR_HOST))
|
||||||
HOST_STAMP_INSTALLED:=$(HOST_BUILD_PREFIX)/stamp/.$(PKG_NAME)_installed
|
HOST_STAMP_INSTALLED:=$(HOST_BUILD_PREFIX)/stamp/.$(PKG_NAME)_installed
|
||||||
HOST_STAMP_PROGRAMS:=$(foreach program,$(PKG_PROGRAMS),$(subst $(PKG_NAME),$(program),$(HOST_STAMP_INSTALLED)) )
|
HOST_STAMP_PROGRAMS:=$(foreach program,$(PKG_PROGRAMS),$(dir $(HOST_STAMP_INSTALLED))$(subst $(PKG_NAME),$(program),$(notdir $(HOST_STAMP_INSTALLED))) )
|
||||||
|
|
||||||
override MAKEFLAGS=
|
override MAKEFLAGS=
|
||||||
|
|
||||||
|
|
|
@ -100,7 +100,9 @@ linksys,ea7300-v2|\
|
||||||
linksys,ea7500-v2|\
|
linksys,ea7500-v2|\
|
||||||
linksys,ea8100-v1|\
|
linksys,ea8100-v1|\
|
||||||
linksys,ea8100-v2|\
|
linksys,ea8100-v2|\
|
||||||
mts,wg430223)
|
mts,wg430223|\
|
||||||
|
ubnt,edgerouter-x|\
|
||||||
|
ubnt,edgerouter-x-sfp)
|
||||||
ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x1000" "0x20000"
|
ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x1000" "0x20000"
|
||||||
;;
|
;;
|
||||||
snr,snr-cpe-me1|\
|
snr,snr-cpe-me1|\
|
||||||
|
|
|
@ -8,12 +8,12 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=gettext-full
|
PKG_NAME:=gettext-full
|
||||||
PKG_VERSION:=0.21.1
|
PKG_VERSION:=0.22.5
|
||||||
PKG_RELEASE:=2
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=gettext-$(PKG_VERSION).tar.xz
|
PKG_SOURCE:=gettext-$(PKG_VERSION).tar.xz
|
||||||
PKG_SOURCE_URL:=@GNU/gettext
|
PKG_SOURCE_URL:=@GNU/gettext
|
||||||
PKG_HASH:=50dbc8f39797950aa2c98e939947c527e5ac9ebd2c1b99dd7b06ba33a6767ae6
|
PKG_HASH:=fe10c37353213d78a5b83d48af231e005c4da84db5ce88037d88355938259640
|
||||||
PKG_BUILD_DIR:=$(BUILD_DIR)/gettext-$(PKG_VERSION)
|
PKG_BUILD_DIR:=$(BUILD_DIR)/gettext-$(PKG_VERSION)
|
||||||
HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/gettext-$(PKG_VERSION)
|
HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/gettext-$(PKG_VERSION)
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/autogen.sh
|
--- a/autogen.sh
|
||||||
+++ b/autogen.sh
|
+++ b/autogen.sh
|
||||||
@@ -78,6 +78,7 @@ if ! $skip_gnulib; then
|
@@ -81,6 +81,7 @@ if ! $skip_gnulib; then
|
||||||
getopt-gnu
|
getopt-gnu
|
||||||
gettext-h
|
gettext-h
|
||||||
havelib
|
havelib
|
||||||
|
@ -10,7 +10,7 @@
|
||||||
progname
|
progname
|
||||||
--- a/gettext-runtime/src/Makefile.am
|
--- a/gettext-runtime/src/Makefile.am
|
||||||
+++ b/gettext-runtime/src/Makefile.am
|
+++ b/gettext-runtime/src/Makefile.am
|
||||||
@@ -40,7 +40,7 @@ envsubst_SOURCES = envsubst.c
|
@@ -43,7 +43,7 @@ envsubst_SOURCES = envsubst.c
|
||||||
|
|
||||||
# Link dependencies.
|
# Link dependencies.
|
||||||
# Need @LTLIBICONV@ because striconv.c uses iconv().
|
# Need @LTLIBICONV@ because striconv.c uses iconv().
|
||||||
|
|
|
@ -0,0 +1,43 @@
|
||||||
|
--- a/src/files.c
|
||||||
|
+++ b/src/files.c
|
||||||
|
@@ -560,9 +560,9 @@ pkgdatadir (void)
|
||||||
|
char const *
|
||||||
|
m4path (void)
|
||||||
|
{
|
||||||
|
- char const *m4 = getenv ("M4");
|
||||||
|
+ char const *m4 = getenv ("STAGING_DIR_HOST");
|
||||||
|
if (m4)
|
||||||
|
- return m4;
|
||||||
|
+ return strcat(getenv ("STAGING_DIR_HOST"), "/bin/m4");
|
||||||
|
|
||||||
|
/* We don't use relocate2() to store the temporary buffer and re-use
|
||||||
|
it, because m4path() is only called once. */
|
||||||
|
--- a/src/getargs.c
|
||||||
|
+++ b/src/getargs.c
|
||||||
|
@@ -373,11 +373,13 @@ usage (int status)
|
||||||
|
A --long option is required.
|
||||||
|
Otherwise, add exceptions to ../build-aux/cross-options.pl. */
|
||||||
|
|
||||||
|
- printf (_("Usage: %s [OPTION]... FILE\n"), program_name);
|
||||||
|
+ printf (_("Usage: STAGING_DIR_HOST=... %s [OPTION]... FILE\n"), program_name);
|
||||||
|
fputs (_("\
|
||||||
|
Generate a deterministic LR or generalized LR (GLR) parser employing\n\
|
||||||
|
LALR(1), IELR(1), or canonical LR(1) parser tables.\n\
|
||||||
|
\n\
|
||||||
|
+Environment Variable STAGING_DIR_HOST controls path to m4\n\
|
||||||
|
+\n\
|
||||||
|
"), stdout);
|
||||||
|
|
||||||
|
fputs (_("\
|
||||||
|
@@ -450,6 +452,11 @@ Output Files:\n\
|
||||||
|
-M, --file-prefix-map=OLD=NEW replace prefix OLD with NEW when writing file paths\n\
|
||||||
|
in output files\n\
|
||||||
|
"), stdout);
|
||||||
|
+
|
||||||
|
+ fputs (_("\
|
||||||
|
+Environment Variables:\n\
|
||||||
|
+ STAGING_DIR_HOST Path to m4 is [STAGING_DIR_HOST]/bin/m4\n\
|
||||||
|
+"), stdout);
|
||||||
|
putc ('\n', stdout);
|
||||||
|
|
||||||
|
argmatch_report_usage (stdout);
|
|
@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=coreutils
|
PKG_NAME:=coreutils
|
||||||
PKG_CPE_ID:=cpe:/a:gnu:coreutils
|
PKG_CPE_ID:=cpe:/a:gnu:coreutils
|
||||||
PKG_VERSION:=9.3
|
PKG_VERSION:=9.5
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=@GNU/coreutils
|
PKG_SOURCE_URL:=@GNU/coreutils
|
||||||
PKG_HASH:=a33d2c0bc49be3c79a4794944dcd87103bf497b53a14bafcd431c8ca53975252
|
PKG_HASH:=767ae6a22950ec42f3ba5f7c1de79dd27800ee8e9b8642da5dedb5974a1741e5
|
||||||
|
|
||||||
HOST_BUILD_PARALLEL := 1
|
HOST_BUILD_PARALLEL := 1
|
||||||
|
|
||||||
|
@ -22,7 +22,13 @@ include $(INCLUDE_DIR)/host-build.mk
|
||||||
|
|
||||||
export GNULIB_SRCDIR:=$(HOST_GNULIB_SRCDIR)
|
export GNULIB_SRCDIR:=$(HOST_GNULIB_SRCDIR)
|
||||||
|
|
||||||
|
HOST_GNULIB_SKIP := \
|
||||||
|
lib/nstrftime.c \
|
||||||
|
lib/fprintftime.c \
|
||||||
|
lib/locale.in.h
|
||||||
|
|
||||||
HOST_CONFIGURE_ARGS += \
|
HOST_CONFIGURE_ARGS += \
|
||||||
|
--disable-year2038 \
|
||||||
--enable-install-program=$(subst $(space),$(comma),$(strip $(PKG_PROGRAMS)))
|
--enable-install-program=$(subst $(space),$(comma),$(strip $(PKG_PROGRAMS)))
|
||||||
|
|
||||||
HOST_MAKE_FLAGS += \
|
HOST_MAKE_FLAGS += \
|
||||||
|
@ -50,7 +56,7 @@ endef
|
||||||
|
|
||||||
define Host/Configure
|
define Host/Configure
|
||||||
$(if $(QUILT),$(call Host/Bootstrap))
|
$(if $(QUILT),$(call Host/Bootstrap))
|
||||||
-$(CP) $(HOST_BUILD_DIR)/lib/time.in.h~ $(HOST_BUILD_DIR)/lib/time.in.h # @GNULIB_TIME@ not defined
|
$(foreach src,$(HOST_GNULIB_SKIP),mv -f $(HOST_BUILD_DIR)/$(src)~ $(HOST_BUILD_DIR)/$(src) || true; )
|
||||||
$(call Host/Configure/Default)
|
$(call Host/Configure/Default)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/bootstrap
|
--- a/bootstrap
|
||||||
+++ b/bootstrap
|
+++ b/bootstrap
|
||||||
@@ -278,7 +278,7 @@ check_exists() {
|
@@ -244,7 +244,7 @@ check_exists() {
|
||||||
($2 --version </dev/null)
|
($2 --version </dev/null)
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
|
@ -9,7 +9,7 @@
|
||||||
fi
|
fi
|
||||||
|
|
||||||
test $? -lt 126
|
test $? -lt 126
|
||||||
@@ -563,7 +563,7 @@ p
|
@@ -309,7 +309,7 @@ p
|
||||||
q'
|
q'
|
||||||
|
|
||||||
get_version() {
|
get_version() {
|
||||||
|
@ -18,7 +18,7 @@
|
||||||
|
|
||||||
$app --version >/dev/null 2>&1 || { $app --version; return 1; }
|
$app --version >/dev/null 2>&1 || { $app --version; return 1; }
|
||||||
|
|
||||||
@@ -620,13 +620,13 @@ check_versions() {
|
@@ -366,13 +366,13 @@ check_versions() {
|
||||||
if [ "$req_ver" = "-" ]; then
|
if [ "$req_ver" = "-" ]; then
|
||||||
# Merely require app to exist; not all prereq apps are well-behaved
|
# Merely require app to exist; not all prereq apps are well-behaved
|
||||||
# so we have to rely on $? rather than get_version.
|
# so we have to rely on $? rather than get_version.
|
||||||
|
@ -34,12 +34,12 @@
|
||||||
if [ ! "$inst_ver" ]; then
|
if [ ! "$inst_ver" ]; then
|
||||||
warn_ "Error: '$app' not found"
|
warn_ "Error: '$app' not found"
|
||||||
ret=1
|
ret=1
|
||||||
@@ -923,7 +923,7 @@ version_controlled_file() {
|
@@ -1157,7 +1157,7 @@ autogen()
|
||||||
# two just-pre-run programs.
|
# two just-pre-run programs.
|
||||||
|
|
||||||
# Import from gettext.
|
# Import from gettext.
|
||||||
-with_gettext=yes
|
- with_gettext=yes
|
||||||
+with_gettext=no
|
+ with_gettext=no
|
||||||
grep '^[ ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \
|
grep '^[ ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \
|
||||||
with_gettext=no
|
with_gettext=no
|
||||||
|
|
||||||
|
|
|
@ -3,12 +3,12 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=elfutils
|
PKG_NAME:=elfutils
|
||||||
PKG_VERSION:=0.189
|
PKG_VERSION:=0.191
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
||||||
PKG_SOURCE_URL:=https://sourceware.org/$(PKG_NAME)/ftp/$(PKG_VERSION)
|
PKG_SOURCE_URL:=https://sourceware.org/$(PKG_NAME)/ftp/$(PKG_VERSION)
|
||||||
PKG_HASH:=39bd8f1a338e2b7cd4abc3ff11a0eddc6e690f69578a57478d8179b4148708c8
|
PKG_HASH:=df76db71366d1d708365fc7a6c60ca48398f14367eb2b8954efc8897147ad871
|
||||||
|
|
||||||
PKG_LICENSE:=GPL-3.0-or-later
|
PKG_LICENSE:=GPL-3.0-or-later
|
||||||
PKG_LICENSE_FILES:=COPYING COPYING-GPLV2 COPYING-LGPLV3
|
PKG_LICENSE_FILES:=COPYING COPYING-GPLV2 COPYING-LGPLV3
|
||||||
|
@ -17,6 +17,37 @@ PKG_CPE_ID:=cpe:/a:elfutils_project:elfutils
|
||||||
PKG_FIXUP:=autoreconf
|
PKG_FIXUP:=autoreconf
|
||||||
PKG_INSTALL:=1
|
PKG_INSTALL:=1
|
||||||
|
|
||||||
|
PKG_SUBDIRS := \
|
||||||
|
libgnu \
|
||||||
|
config \
|
||||||
|
lib \
|
||||||
|
libelf \
|
||||||
|
libcpu \
|
||||||
|
backends \
|
||||||
|
libebl \
|
||||||
|
libdwelf \
|
||||||
|
libdwfl \
|
||||||
|
libdw
|
||||||
|
|
||||||
|
PKG_GNULIB_BASE:=libgnu
|
||||||
|
|
||||||
|
PKG_GNULIB_ARGS = \
|
||||||
|
--dir=$(HOST_BUILD_DIR) \
|
||||||
|
--local-dir=$(STAGING_DIR_HOST)/share/gnulib \
|
||||||
|
--source-base=$(PKG_GNULIB_BASE) \
|
||||||
|
--libtool \
|
||||||
|
--avoid=reallocarray \
|
||||||
|
--import
|
||||||
|
|
||||||
|
PKG_GNULIB_MODS = \
|
||||||
|
argp \
|
||||||
|
dirname \
|
||||||
|
fts \
|
||||||
|
obstack \
|
||||||
|
progname \
|
||||||
|
strchrnul \
|
||||||
|
tsearch
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/host-build.mk
|
include $(INCLUDE_DIR)/host-build.mk
|
||||||
|
|
||||||
ifeq ($(HOST_OS),Darwin)
|
ifeq ($(HOST_OS),Darwin)
|
||||||
|
@ -43,10 +74,18 @@ endif
|
||||||
|
|
||||||
Hooks/HostConfigure/Pre := Host/Gnulib $(Hooks/HostConfigure/Pre)
|
Hooks/HostConfigure/Pre := Host/Gnulib $(Hooks/HostConfigure/Pre)
|
||||||
define Host/Gnulib
|
define Host/Gnulib
|
||||||
cd $(HOST_BUILD_DIR); $(STAGING_DIR_HOST)/bin/gnulib-tool --libtool --source-base=libgnu --import argp obstack fts strchrnul progname tsearch;
|
$(STAGING_DIR_HOST)/bin/gnulib-tool $(PKG_GNULIB_ARGS) $(PKG_GNULIB_MODS);
|
||||||
ln -sf ../lib/eu-config.h $(HOST_BUILD_DIR)/libgnu/;
|
ln -sf ../lib/eu-config.h $(HOST_BUILD_DIR)/libgnu/;
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
define Host/Compile
|
||||||
|
$(call Host/Compile/Default,SUBDIRS='$$$$(wildcard $(PKG_SUBDIRS))')
|
||||||
|
endef
|
||||||
|
|
||||||
|
define Host/Install
|
||||||
|
$(call Host/Compile/Default,install SUBDIRS='$$$$(wildcard $(PKG_SUBDIRS))')
|
||||||
|
endef
|
||||||
|
|
||||||
define Host/Uninstall
|
define Host/Uninstall
|
||||||
-$(call Host/Compile/Default,uninstall)
|
-$(call Host/Compile/Default,uninstall)
|
||||||
endef
|
endef
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
+++ b/configure.ac
|
+++ b/configure.ac
|
||||||
@@ -20,6 +20,7 @@ dnl You should have received a copy of
|
@@ -20,6 +20,7 @@ dnl You should have received a copy of
|
||||||
dnl along with this program. If not, see <http://www.gnu.org/licenses/>.
|
dnl along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
AC_INIT([elfutils],[0.189],[https://sourceware.org/bugzilla],[elfutils],[http://elfutils.org/])
|
AC_INIT([elfutils],[0.191],[https://sourceware.org/bugzilla],[elfutils],[http://elfutils.org/])
|
||||||
|
|
||||||
+AC_CONFIG_MACRO_DIRS([m4])
|
+AC_CONFIG_MACRO_DIRS([m4])
|
||||||
dnl Workaround for older autoconf < 2.64
|
dnl Workaround for older autoconf < 2.64
|
||||||
|
@ -15,7 +15,7 @@
|
||||||
-AC_CONFIG_FILES([config/Makefile])
|
-AC_CONFIG_FILES([config/Makefile])
|
||||||
+AC_CONFIG_FILES([config/Makefile libgnu/Makefile])
|
+AC_CONFIG_FILES([config/Makefile libgnu/Makefile])
|
||||||
|
|
||||||
AC_COPYRIGHT([Copyright (C) 1996-2023 The elfutils developers.])
|
AC_COPYRIGHT([Copyright (C) 1996-2024 The elfutils developers.])
|
||||||
-AC_PREREQ(2.63) dnl Minimum Autoconf version required.
|
-AC_PREREQ(2.63) dnl Minimum Autoconf version required.
|
||||||
+AC_PREREQ(2.64) dnl Minimum Autoconf version required.
|
+AC_PREREQ(2.64) dnl Minimum Autoconf version required.
|
||||||
|
|
||||||
|
@ -89,23 +89,6 @@
|
||||||
dnl The directories with content.
|
dnl The directories with content.
|
||||||
|
|
||||||
dnl Documentation.
|
dnl Documentation.
|
||||||
--- a/Makefile.am
|
|
||||||
+++ b/Makefile.am
|
|
||||||
@@ -26,11 +26,11 @@ AM_MAKEFLAGS = --no-print-directory
|
|
||||||
|
|
||||||
pkginclude_HEADERS = version.h
|
|
||||||
|
|
||||||
-SUBDIRS = config lib libelf libcpu backends libebl libdwelf libdwfl libdw \
|
|
||||||
- libasm debuginfod src po doc tests
|
|
||||||
+SUBDIRS = libgnu config lib libelf libcpu backends libebl libdwelf libdwfl libdw
|
|
||||||
|
|
||||||
EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \
|
|
||||||
- COPYING COPYING-GPLV2 COPYING-LGPLV3
|
|
||||||
+ COPYING COPYING-GPLV2 COPYING-LGPLV3 \
|
|
||||||
+ m4/gnulib-cache.m4
|
|
||||||
|
|
||||||
# Make sure the test install uses lib64 when $LIB will yield lib64.
|
|
||||||
# Make sure the test build uses the same compiler, which on e.g. ppc64
|
|
||||||
--- a/libelf/elf_update.c
|
--- a/libelf/elf_update.c
|
||||||
+++ b/libelf/elf_update.c
|
+++ b/libelf/elf_update.c
|
||||||
@@ -37,6 +37,33 @@
|
@@ -37,6 +37,33 @@
|
||||||
|
@ -144,8 +127,8 @@
|
||||||
write_file (Elf *elf, int64_t size, int change_bo, size_t shnum)
|
write_file (Elf *elf, int64_t size, int change_bo, size_t shnum)
|
||||||
--- a/lib/eu-config.h
|
--- a/lib/eu-config.h
|
||||||
+++ b/lib/eu-config.h
|
+++ b/lib/eu-config.h
|
||||||
@@ -52,14 +52,18 @@
|
@@ -59,14 +59,18 @@
|
||||||
# define rwlock_unlock(lock) ((void) (lock))
|
# define once(once_control, init_routine) init_routine()
|
||||||
#endif /* USE_LOCKS */
|
#endif /* USE_LOCKS */
|
||||||
|
|
||||||
-#include <libintl.h>
|
-#include <libintl.h>
|
||||||
|
@ -164,7 +147,7 @@
|
||||||
|
|
||||||
#ifdef __i386__
|
#ifdef __i386__
|
||||||
# define internal_function __attribute__ ((regparm (3), stdcall))
|
# define internal_function __attribute__ ((regparm (3), stdcall))
|
||||||
@@ -70,12 +74,7 @@
|
@@ -77,12 +81,7 @@
|
||||||
#define internal_strong_alias(name, aliasname) \
|
#define internal_strong_alias(name, aliasname) \
|
||||||
extern __typeof (name) aliasname __attribute__ ((alias (#name))) internal_function;
|
extern __typeof (name) aliasname __attribute__ ((alias (#name))) internal_function;
|
||||||
|
|
||||||
|
@ -177,7 +160,7 @@
|
||||||
|
|
||||||
#ifdef HAVE_GCC_STRUCT
|
#ifdef HAVE_GCC_STRUCT
|
||||||
#define attribute_packed \
|
#define attribute_packed \
|
||||||
@@ -159,7 +158,7 @@ asm (".section predict_data, \"aw\"; .pr
|
@@ -166,7 +165,7 @@ asm (".section predict_data, \"aw\"; .pr
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Avoid PLT entries. */
|
/* Avoid PLT entries. */
|
||||||
|
@ -361,20 +344,6 @@
|
||||||
+{
|
+{
|
||||||
+ return ppc_check_object_attribute(ebl, vendor, tag, value, tag_name, value_name);
|
+ return ppc_check_object_attribute(ebl, vendor, tag, value, tag_name, value_name);
|
||||||
+}
|
+}
|
||||||
--- a/lib/libeu.h
|
|
||||||
+++ b/lib/libeu.h
|
|
||||||
@@ -45,4 +45,11 @@ extern char *xasprintf(const char *fmt,
|
|
||||||
extern uint32_t crc32 (uint32_t crc, unsigned char *buf, size_t len);
|
|
||||||
extern int crc32_file (int fd, uint32_t *resp);
|
|
||||||
|
|
||||||
+#ifdef __APPLE__
|
|
||||||
+static inline void tdestroy(void *root __attribute__ ((unused)),
|
|
||||||
+ void (*freekey)(void *) __attribute__ ((unused)))
|
|
||||||
+{
|
|
||||||
+}
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#endif
|
|
||||||
--- a/libdwfl/libdwflP.h
|
--- a/libdwfl/libdwflP.h
|
||||||
+++ b/libdwfl/libdwflP.h
|
+++ b/libdwfl/libdwflP.h
|
||||||
@@ -31,6 +31,8 @@
|
@@ -31,6 +31,8 @@
|
||||||
|
@ -382,7 +351,7 @@
|
||||||
#include <libdwfl.h>
|
#include <libdwfl.h>
|
||||||
#include <libebl.h>
|
#include <libebl.h>
|
||||||
+#include <libeu.h>
|
+#include <libeu.h>
|
||||||
+#include <libgen.h>
|
+#include <dirname.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <dirent.h>
|
#include <dirent.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
@ -404,7 +373,7 @@
|
||||||
+#include <libeu.h>
|
+#include <libeu.h>
|
||||||
#include <libdw.h>
|
#include <libdw.h>
|
||||||
#include <dwarf.h>
|
#include <dwarf.h>
|
||||||
+#include <libgen.h>
|
+#include <dirname.h>
|
||||||
|
|
||||||
|
|
||||||
/* Known location expressions already decoded. */
|
/* Known location expressions already decoded. */
|
||||||
|
@ -597,7 +566,7 @@
|
||||||
|
|
||||||
modules = i386 sh x86_64 ia64 alpha arm aarch64 sparc ppc ppc64 s390 \
|
modules = i386 sh x86_64 ia64 alpha arm aarch64 sparc ppc ppc64 s390 \
|
||||||
m68k bpf riscv csky loongarch arc
|
m68k bpf riscv csky loongarch arc
|
||||||
@@ -100,17 +100,13 @@ loongarch_SRCS = loongarch_init.c loonga
|
@@ -102,17 +102,13 @@ loongarch_SRCS = loongarch_init.c loonga
|
||||||
|
|
||||||
arc_SRCS = arc_init.c arc_symbol.c
|
arc_SRCS = arc_init.c arc_symbol.c
|
||||||
|
|
||||||
|
@ -779,7 +748,7 @@
|
||||||
+++ b/src/Makefile.am
|
+++ b/src/Makefile.am
|
||||||
@@ -29,9 +29,9 @@ bin_PROGRAMS = readelf nm size strip elf
|
@@ -29,9 +29,9 @@ bin_PROGRAMS = readelf nm size strip elf
|
||||||
elfcmp objdump ranlib strings ar unstrip stack elfcompress \
|
elfcmp objdump ranlib strings ar unstrip stack elfcompress \
|
||||||
elfclassify
|
elfclassify srcfiles
|
||||||
|
|
||||||
-noinst_LIBRARIES = libar.a
|
-noinst_LIBRARIES = libar.a
|
||||||
+noinst_LTLIBRARIES = libar.la
|
+noinst_LTLIBRARIES = libar.la
|
||||||
|
@ -789,30 +758,41 @@
|
||||||
|
|
||||||
EXTRA_DIST = arlib.h debugpred.h
|
EXTRA_DIST = arlib.h debugpred.h
|
||||||
|
|
||||||
@@ -39,17 +39,11 @@ bin_SCRIPTS = make-debug-archive
|
@@ -39,27 +39,16 @@ bin_SCRIPTS = make-debug-archive
|
||||||
EXTRA_DIST += make-debug-archive.in
|
EXTRA_DIST += make-debug-archive.in
|
||||||
CLEANFILES += make-debug-archive
|
CLEANFILES += make-debug-archive
|
||||||
|
|
||||||
-if BUILD_STATIC
|
-if BUILD_STATIC
|
||||||
-libasm = ../libasm/libasm.a
|
-libasm = ../libasm/libasm.a
|
||||||
-libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) -ldl -lpthread
|
-libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) -ldl -lpthread
|
||||||
-libelf = ../libelf/libelf.a -lz
|
-libelf = ../libelf/libelf.a -lz $(zstd_LIBS)
|
||||||
|
+libasm = ../libasm/libasm.la
|
||||||
|
+libdw = ../libdw/libdw.la -lz $(zip_LIBS) $(libelf) -ldl -lpthread
|
||||||
|
+libelf = ../libelf/libelf.la -lz $(zstd_LIBS)
|
||||||
|
if LIBDEBUGINFOD
|
||||||
|
-libdebuginfod = ../debuginfod/libdebuginfod.a -lpthread $(libcurl_LIBS)
|
||||||
|
+libdebuginfod = ../debuginfod/libdebuginfod.la -lpthread $(libcurl_LIBS)
|
||||||
|
else
|
||||||
|
libdebuginfod =
|
||||||
|
endif
|
||||||
-else
|
-else
|
||||||
-libasm = ../libasm/libasm.so
|
-libasm = ../libasm/libasm.so
|
||||||
-libdw = ../libdw/libdw.so
|
-libdw = ../libdw/libdw.so
|
||||||
-libelf = ../libelf/libelf.so
|
-libelf = ../libelf/libelf.so
|
||||||
|
-if LIBDEBUGINFOD
|
||||||
|
-libdebuginfod = ../debuginfod/libdebuginfod.so
|
||||||
|
-else
|
||||||
|
-libdebuginfod =
|
||||||
|
-endif
|
||||||
-endif
|
-endif
|
||||||
-libebl = ../libebl/libebl.a ../backends/libebl_backends.a ../libcpu/libcpu.a
|
-libebl = ../libebl/libebl.a ../backends/libebl_backends.a ../libcpu/libcpu.a
|
||||||
-libeu = ../lib/libeu.a
|
-libeu = ../lib/libeu.a
|
||||||
+libasm = ../libasm/libasm.la
|
|
||||||
+libdw = ../libdw/libdw.la -lz $(zip_LIBS) $(libelf) -ldl -lpthread
|
|
||||||
+libelf = ../libelf/libelf.la
|
|
||||||
+libebl = ../libebl/libebl.la ../backends/libebl_backends.la ../libcpu/libcpu.la
|
+libebl = ../libebl/libebl.la ../backends/libebl_backends.la ../libcpu/libcpu.la
|
||||||
+libeu = ../lib/libeu.la
|
+libeu = ../lib/libeu.la
|
||||||
|
|
||||||
if DEMANGLE
|
if DEMANGLE
|
||||||
demanglelib = -lstdc++
|
demanglelib = -lstdc++
|
||||||
@@ -77,9 +71,9 @@ findtextrel_LDADD = $(libdw) $(libelf) $
|
@@ -87,9 +76,9 @@ findtextrel_LDADD = $(libdw) $(libelf) $
|
||||||
addr2line_LDADD = $(libdw) $(libelf) $(libeu) $(argp_LDADD) $(demanglelib)
|
addr2line_LDADD = $(libdw) $(libelf) $(libeu) $(argp_LDADD) $(demanglelib)
|
||||||
elfcmp_LDADD = $(libebl) $(libdw) $(libelf) $(libeu) $(argp_LDADD)
|
elfcmp_LDADD = $(libebl) $(libdw) $(libelf) $(libeu) $(argp_LDADD)
|
||||||
objdump_LDADD = $(libasm) $(libebl) $(libdw) $(libelf) $(libeu) $(argp_LDADD)
|
objdump_LDADD = $(libasm) $(libebl) $(libdw) $(libelf) $(libeu) $(argp_LDADD)
|
||||||
|
@ -826,13 +806,13 @@
|
||||||
elfcompress_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD)
|
elfcompress_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD)
|
||||||
--- a/tests/Makefile.am
|
--- a/tests/Makefile.am
|
||||||
+++ b/tests/Makefile.am
|
+++ b/tests/Makefile.am
|
||||||
@@ -662,17 +662,11 @@ installcheck-local:
|
@@ -689,17 +689,11 @@ installcheck-local:
|
||||||
TESTS_ENVIRONMENT="$(installed_TESTS_ENVIRONMENT)" \
|
TESTS_ENVIRONMENT="$(installed_TESTS_ENVIRONMENT)" \
|
||||||
LOG_COMPILER="$(installed_LOG_COMPILER)" check-TESTS
|
LOG_COMPILER="$(installed_LOG_COMPILER)" check-TESTS
|
||||||
|
|
||||||
-if BUILD_STATIC
|
-if BUILD_STATIC
|
||||||
-libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl -lpthread
|
-libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl -lpthread
|
||||||
-libelf = ../libelf/libelf.a -lz
|
-libelf = ../libelf/libelf.a -lz $(zstd_LIBS)
|
||||||
-libasm = ../libasm/libasm.a
|
-libasm = ../libasm/libasm.a
|
||||||
-else
|
-else
|
||||||
-libdw = ../libdw/libdw.so
|
-libdw = ../libdw/libdw.so
|
||||||
|
@ -908,3 +888,13 @@
|
||||||
Cflags: -I${includedir}
|
Cflags: -I${includedir}
|
||||||
|
|
||||||
Requires.private: zlib @LIBZSTD@
|
Requires.private: zlib @LIBZSTD@
|
||||||
|
--- a/lib/next_prime.c
|
||||||
|
+++ b/lib/next_prime.c
|
||||||
|
@@ -27,6 +27,7 @@
|
||||||
|
the GNU Lesser General Public License along with this program. If
|
||||||
|
not, see <http://www.gnu.org/licenses/>. */
|
||||||
|
|
||||||
|
+#include <config.h>
|
||||||
|
#include <stddef.h>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -2,11 +2,11 @@ include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=gnulib
|
PKG_NAME:=gnulib
|
||||||
PKG_CPE_ID:=cpe:/a:gnu:$(PKG_NAME)
|
PKG_CPE_ID:=cpe:/a:gnu:$(PKG_NAME)
|
||||||
PKG_VERSION:=f9a4ee73c3e7b544f640d0d04b55983d3a7b894e# # master
|
PKG_VERSION:=c99c8d491850dc3a6e0b8604a2729d8bc5c0eff1# # stable-202401
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=https://git.savannah.gnu.org/cgit/$(PKG_NAME).git/snapshot
|
PKG_SOURCE_URL:=https://git.savannah.gnu.org/cgit/$(PKG_NAME).git/snapshot
|
||||||
PKG_HASH:=514716d58987a9c0de0d69fb22d42bcd19edf80eed099882a004ff162060f1a8
|
PKG_HASH:=8e6f4a907d9677b55fd452e1340a3e030a6f530b138d420c11975da33f086b1e
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/host-build.mk
|
include $(INCLUDE_DIR)/host-build.mk
|
||||||
|
|
||||||
|
|
|
@ -43,7 +43,7 @@
|
||||||
if [ ! "$inst_ver" ]; then
|
if [ ! "$inst_ver" ]; then
|
||||||
warn_ "Error: '$app' not found"
|
warn_ "Error: '$app' not found"
|
||||||
ret=1
|
ret=1
|
||||||
@@ -1135,7 +1135,7 @@ autogen()
|
@@ -1157,7 +1157,7 @@ autogen()
|
||||||
# two just-pre-run programs.
|
# two just-pre-run programs.
|
||||||
|
|
||||||
# Import from gettext.
|
# Import from gettext.
|
||||||
|
|
|
@ -0,0 +1,193 @@
|
||||||
|
--- a/lib/search.in.h
|
||||||
|
+++ b/lib/search.in.h
|
||||||
|
@@ -112,6 +112,11 @@ _GL_CXXALIASWARN (lsearch);
|
||||||
|
# define twalk rpl_twalk
|
||||||
|
# endif
|
||||||
|
# endif
|
||||||
|
+# if @REPLACE_TDESTROY@
|
||||||
|
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
|
||||||
|
+# define tdestroy rpl_tdestroy
|
||||||
|
+# endif
|
||||||
|
+# endif
|
||||||
|
|
||||||
|
/* See <https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/search.h.html>
|
||||||
|
<https://pubs.opengroup.org/onlinepubs/9699919799/functions/tsearch.html>
|
||||||
|
@@ -137,6 +142,7 @@ extern "C" {
|
||||||
|
# if !GNULIB_defined_search_fn_types
|
||||||
|
typedef int (*_gl_search_compar_fn) (const void *, const void *);
|
||||||
|
typedef void (*_gl_search_action_fn) (const void *, VISIT, int);
|
||||||
|
+typedef void (*_gl_search_free_fn) (void *);
|
||||||
|
# define GNULIB_defined_search_fn_types 1
|
||||||
|
# endif
|
||||||
|
# ifdef __cplusplus
|
||||||
|
@@ -252,9 +258,36 @@ _GL_CXXALIAS_SYS (twalk, void,
|
||||||
|
_GL_CXXALIASWARN (twalk);
|
||||||
|
# endif
|
||||||
|
|
||||||
|
+/* Removes the whole tree pointed to by root,
|
||||||
|
+ freeing all resources allocated by the tsearch() function.
|
||||||
|
+ The FREE_NODE function is called:
|
||||||
|
+ - For the data in each tree node.
|
||||||
|
+ - Even when no such work is necessary, to a function doing nothing
|
||||||
|
+ The arguments passed to FREE_NODE are:
|
||||||
|
+ 1. The pointer to the data. */
|
||||||
|
+# if @REPLACE_TDESTROY@
|
||||||
|
+_GL_FUNCDECL_RPL (tdestroy, void,
|
||||||
|
+ (void *vroot, _gl_search_free_fn freefct)
|
||||||
|
+ _GL_ARG_NONNULL ((2)));
|
||||||
|
+_GL_CXXALIAS_RPL (tdestroy, void,
|
||||||
|
+ (void *vroot, _gl_search_free_fn freefct));
|
||||||
|
+# else
|
||||||
|
+# if !@HAVE_TDESTROY@
|
||||||
|
+_GL_FUNCDECL_SYS (tdestroy, void,
|
||||||
|
+ (void *vroot, _gl_search_free_fn freefct)
|
||||||
|
+ _GL_ARG_NONNULL ((2)));
|
||||||
|
+# endif
|
||||||
|
+_GL_CXXALIAS_SYS (tdestroy, void,
|
||||||
|
+ (void *vroot, _gl_search_free_fn freefct));
|
||||||
|
+# endif
|
||||||
|
+# if __GLIBC__ >= 2
|
||||||
|
+_GL_CXXALIASWARN (tdestroy);
|
||||||
|
+# endif
|
||||||
|
+
|
||||||
|
/* Flags used by tsearch.c. */
|
||||||
|
# define GNULIB_defined_tsearch (@REPLACE_TSEARCH@ || !@HAVE_TSEARCH@)
|
||||||
|
# define GNULIB_defined_twalk (@REPLACE_TWALK@ || !@HAVE_TWALK@)
|
||||||
|
+# define GNULIB_defined_tdestroy (@REPLACE_TDESTROY@ || !@HAVE_TDESTROY@)
|
||||||
|
|
||||||
|
#elif defined GNULIB_POSIXCHECK
|
||||||
|
# undef tsearch
|
||||||
|
@@ -277,6 +310,11 @@ _GL_WARN_ON_USE (tdelete, "tdelete is un
|
||||||
|
_GL_WARN_ON_USE (twalk, "twalk is unportable - "
|
||||||
|
"use gnulib module tsearch for portability");
|
||||||
|
# endif
|
||||||
|
+# undef tdestroy
|
||||||
|
+# if HAVE_RAW_DECL_TDESTROY
|
||||||
|
+_GL_WARN_ON_USE (tdestroy, "tdestroy is unportable - "
|
||||||
|
+ "use gnulib module tsearch for portability");
|
||||||
|
+# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
--- a/lib/tsearch.c
|
||||||
|
+++ b/lib/tsearch.c
|
||||||
|
@@ -98,12 +98,14 @@
|
||||||
|
|
||||||
|
typedef int (*__compar_fn_t) (const void *, const void *);
|
||||||
|
typedef void (*__action_fn_t) (const void *, VISIT, int);
|
||||||
|
+typedef void (*__free_fn_t) (void *);
|
||||||
|
|
||||||
|
#ifndef weak_alias
|
||||||
|
# define __tsearch tsearch
|
||||||
|
# define __tfind tfind
|
||||||
|
# define __tdelete tdelete
|
||||||
|
# define __twalk twalk
|
||||||
|
+# define __tdestroy tdestroy
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef internal_function
|
||||||
|
@@ -656,7 +658,7 @@ weak_alias (__twalk, twalk)
|
||||||
|
#endif /* GNULIB_defined_twalk */
|
||||||
|
|
||||||
|
|
||||||
|
-#ifdef _LIBC
|
||||||
|
+#if defined(_LIBC) || GNULIB_defined_tdestroy
|
||||||
|
|
||||||
|
/* The standardized functions miss an important functionality: the
|
||||||
|
tree cannot be removed easily. We provide a function to do this. */
|
||||||
|
@@ -683,6 +685,8 @@ __tdestroy (void *vroot, __free_fn_t fre
|
||||||
|
if (root != NULL)
|
||||||
|
tdestroy_recurse (root, freefct);
|
||||||
|
}
|
||||||
|
+#ifdef weak_alias
|
||||||
|
weak_alias (__tdestroy, tdestroy)
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
-#endif /* _LIBC */
|
||||||
|
+#endif /* defined(_LIBC) || GNULIB_defined_tdestroy */
|
||||||
|
--- a/m4/search_h.m4
|
||||||
|
+++ b/m4/search_h.m4
|
||||||
|
@@ -39,7 +39,7 @@ AC_DEFUN_ONCE([gl_SEARCH_H],
|
||||||
|
dnl Check for declarations of anything we want to poison if the
|
||||||
|
dnl corresponding gnulib module is not in use.
|
||||||
|
gl_WARN_ON_USE_PREPARE([[#include <search.h>
|
||||||
|
- ]], [tdelete tfind tsearch twalk])
|
||||||
|
+ ]], [tdelete tfind tsearch twalk tdestroy])
|
||||||
|
|
||||||
|
AC_REQUIRE([AC_C_RESTRICT])
|
||||||
|
])
|
||||||
|
@@ -75,8 +75,10 @@ AC_DEFUN([gl_SEARCH_H_DEFAULTS],
|
||||||
|
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_LFIND], [1])
|
||||||
|
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_LSEARCH], [1])
|
||||||
|
dnl Assume proper GNU behavior unless another module says otherwise.
|
||||||
|
- HAVE_TSEARCH=1; AC_SUBST([HAVE_TSEARCH])
|
||||||
|
- HAVE_TWALK=1; AC_SUBST([HAVE_TWALK])
|
||||||
|
- REPLACE_TSEARCH=0; AC_SUBST([REPLACE_TSEARCH])
|
||||||
|
- REPLACE_TWALK=0; AC_SUBST([REPLACE_TWALK])
|
||||||
|
+ HAVE_TSEARCH=1; AC_SUBST([HAVE_TSEARCH])
|
||||||
|
+ HAVE_TWALK=1; AC_SUBST([HAVE_TWALK])
|
||||||
|
+ HAVE_TDESTROY=1; AC_SUBST([HAVE_TDESTROY])
|
||||||
|
+ REPLACE_TSEARCH=0; AC_SUBST([REPLACE_TSEARCH])
|
||||||
|
+ REPLACE_TWALK=0; AC_SUBST([REPLACE_TWALK])
|
||||||
|
+ REPLACE_TDESTROY=0; AC_SUBST([REPLACE_TDESTROY])
|
||||||
|
])
|
||||||
|
--- a/m4/tsearch.m4
|
||||||
|
+++ b/m4/tsearch.m4
|
||||||
|
@@ -9,6 +9,7 @@ AC_DEFUN([gl_FUNC_TSEARCH],
|
||||||
|
AC_REQUIRE([gl_SEARCH_H_DEFAULTS])
|
||||||
|
gl_CHECK_FUNCS_ANDROID([tsearch], [[#include <search.h>]])
|
||||||
|
gl_CHECK_FUNCS_ANDROID([twalk], [[#include <search.h>]])
|
||||||
|
+ gl_CHECK_FUNCS_ANDROID([tdestroy], [[#include <search.h>]])
|
||||||
|
if test $ac_cv_func_tsearch = yes; then
|
||||||
|
dnl On OpenBSD 4.0, the return value of tdelete() is incorrect.
|
||||||
|
AC_REQUIRE([AC_PROG_CC])
|
||||||
|
@@ -50,6 +51,7 @@ main ()
|
||||||
|
*no)
|
||||||
|
REPLACE_TSEARCH=1
|
||||||
|
REPLACE_TWALK=1
|
||||||
|
+ REPLACE_TDESTROY=1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
else
|
||||||
|
@@ -64,6 +66,12 @@ main ()
|
||||||
|
future*) REPLACE_TWALK=1 ;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
+ if test $ac_cv_func_tdestroy != yes; then
|
||||||
|
+ HAVE_TDESTROY=0
|
||||||
|
+ case "$gl_cv_onwards_func_tdestroy" in
|
||||||
|
+ future*) REPLACE_TDESTROY=1 ;;
|
||||||
|
+ esac
|
||||||
|
+ fi
|
||||||
|
])
|
||||||
|
|
||||||
|
# Prerequisites of lib/tsearch.c.
|
||||||
|
--- a/modules/search
|
||||||
|
+++ b/modules/search
|
||||||
|
@@ -37,8 +37,10 @@ search.h: search.in.h $(top_builddir)/co
|
||||||
|
-e 's/@''GNULIB_MDA_LSEARCH''@/$(GNULIB_MDA_LSEARCH)/g' \
|
||||||
|
-e 's|@''HAVE_TSEARCH''@|$(HAVE_TSEARCH)|g' \
|
||||||
|
-e 's|@''HAVE_TWALK''@|$(HAVE_TWALK)|g' \
|
||||||
|
+ -e 's|@''HAVE_TDESTROY''@|$(HAVE_TDESTROY)|g' \
|
||||||
|
-e 's|@''REPLACE_TSEARCH''@|$(REPLACE_TSEARCH)|g' \
|
||||||
|
-e 's|@''REPLACE_TWALK''@|$(REPLACE_TWALK)|g' \
|
||||||
|
+ -e 's|@''REPLACE_TDESTROY''@|$(REPLACE_TDESTROY)|g' \
|
||||||
|
-e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
|
||||||
|
-e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
|
||||||
|
-e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
|
||||||
|
--- a/modules/tsearch
|
||||||
|
+++ b/modules/tsearch
|
||||||
|
@@ -11,7 +11,12 @@ search
|
||||||
|
configure.ac:
|
||||||
|
gl_FUNC_TSEARCH
|
||||||
|
gl_CONDITIONAL([GL_COND_OBJ_TSEARCH],
|
||||||
|
- [test $HAVE_TSEARCH = 0 || test $HAVE_TWALK = 0 || test $REPLACE_TSEARCH = 1 || test $REPLACE_TWALK = 1])
|
||||||
|
+ [test $HAVE_TSEARCH = 0 ||
|
||||||
|
+ test $HAVE_TWALK = 0 ||
|
||||||
|
+ test $HAVE_TDESTROY = 0 ||
|
||||||
|
+ test $REPLACE_TSEARCH = 1 ||
|
||||||
|
+ test $REPLACE_TWALK = 1 ||
|
||||||
|
+ test $REPLACE_TDESTROY = 1])
|
||||||
|
AM_COND_IF([GL_COND_OBJ_TSEARCH], [
|
||||||
|
gl_PREREQ_TSEARCH
|
||||||
|
])
|
|
@ -0,0 +1,115 @@
|
||||||
|
--- a/lib/ialloc.h
|
||||||
|
+++ b/lib/ialloc.h
|
||||||
|
@@ -106,6 +106,8 @@ icalloc (idx_t n, idx_t s)
|
||||||
|
return calloc (n, s);
|
||||||
|
}
|
||||||
|
|
||||||
|
+#if GNULIB_REALLOCARRAY
|
||||||
|
+
|
||||||
|
/* ireallocarray (ptr, num, size) is like reallocarray (ptr, num, size).
|
||||||
|
It returns a non-NULL pointer to num * size bytes of memory.
|
||||||
|
Upon failure, it returns NULL with errno set. */
|
||||||
|
@@ -131,6 +133,8 @@ ireallocarray (void *p, idx_t n, idx_t s
|
||||||
|
return _gl_alloc_nomem ();
|
||||||
|
}
|
||||||
|
|
||||||
|
+#endif /* GNULIB_REALLOCARRAY */
|
||||||
|
+
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
--- a/lib/xmalloc.c
|
||||||
|
+++ b/lib/xmalloc.c
|
||||||
|
@@ -51,12 +51,16 @@ ximalloc (idx_t s)
|
||||||
|
return nonnull (imalloc (s));
|
||||||
|
}
|
||||||
|
|
||||||
|
+#if GNULIB_REALLOCARRAY
|
||||||
|
+
|
||||||
|
char *
|
||||||
|
xcharalloc (size_t n)
|
||||||
|
{
|
||||||
|
return XNMALLOC (n, char);
|
||||||
|
}
|
||||||
|
|
||||||
|
+#endif /* GNULIB_REALLOCARRAY */
|
||||||
|
+
|
||||||
|
/* Change the size of an allocated block of memory P to S bytes,
|
||||||
|
with error checking. */
|
||||||
|
|
||||||
|
@@ -75,6 +79,8 @@ xirealloc (void *p, idx_t s)
|
||||||
|
return nonnull (irealloc (p, s));
|
||||||
|
}
|
||||||
|
|
||||||
|
+#if GNULIB_REALLOCARRAY
|
||||||
|
+
|
||||||
|
/* Change the size of an allocated block of memory P to an array of N
|
||||||
|
objects each of S bytes, with error checking. */
|
||||||
|
|
||||||
|
@@ -205,6 +211,8 @@ x2nrealloc (void *p, size_t *pn, size_t
|
||||||
|
return p;
|
||||||
|
}
|
||||||
|
|
||||||
|
+#endif /* GNULIB_REALLOCARRAY */
|
||||||
|
+
|
||||||
|
/* Grow PA, which points to an array of *PN items, and return the
|
||||||
|
location of the reallocated array, updating *PN to reflect its
|
||||||
|
new size. The new array will contain at least N_INCR_MIN more
|
||||||
|
--- a/lib/xalloc.h
|
||||||
|
+++ b/lib/xalloc.h
|
||||||
|
@@ -129,6 +129,7 @@ char *xstrdup (char const *str)
|
||||||
|
# define XCALLOC(n, t) \
|
||||||
|
((t *) (sizeof (t) == 1 ? xzalloc (n) : xcalloc (n, sizeof (t))))
|
||||||
|
|
||||||
|
+# if GNULIB_REALLOCARRAY
|
||||||
|
|
||||||
|
/* Allocate an array of N objects, each with S bytes of memory,
|
||||||
|
dynamically, with error checking. S must be nonzero. */
|
||||||
|
@@ -156,6 +157,8 @@ char *xcharalloc (size_t n)
|
||||||
|
_GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE
|
||||||
|
_GL_ATTRIBUTE_ALLOC_SIZE ((1)) _GL_ATTRIBUTE_RETURNS_NONNULL;
|
||||||
|
|
||||||
|
+# endif /* GNULIB_REALLOCARRAY */
|
||||||
|
+
|
||||||
|
#endif /* GNULIB_XALLOC */
|
||||||
|
|
||||||
|
|
||||||
|
--- a/lib/safe-alloc.h
|
||||||
|
+++ b/lib/safe-alloc.h
|
||||||
|
@@ -36,6 +36,8 @@ _GL_INLINE_HEADER_BEGIN
|
||||||
|
# define SAFE_ALLOC_INLINE _GL_INLINE
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#if GNULIB_REALLOCARRAY
|
||||||
|
+
|
||||||
|
/* Don't call these directly - use the macros below. */
|
||||||
|
SAFE_ALLOC_INLINE void *
|
||||||
|
safe_alloc_realloc_n (void *ptr, size_t count, size_t size)
|
||||||
|
@@ -51,6 +53,9 @@ safe_alloc_realloc_n (void *ptr, size_t
|
||||||
|
#endif
|
||||||
|
return ptr;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+#endif /* GNULIB_REALLOCARRAY */
|
||||||
|
+
|
||||||
|
_GL_ATTRIBUTE_NODISCARD SAFE_ALLOC_INLINE int
|
||||||
|
safe_alloc_check (void *ptr)
|
||||||
|
{
|
||||||
|
@@ -84,6 +89,8 @@ safe_alloc_check (void *ptr)
|
||||||
|
#define ALLOC_N(ptr, count) \
|
||||||
|
safe_alloc_check ((ptr) = calloc (count, sizeof *(ptr)))
|
||||||
|
|
||||||
|
+#if GNULIB_REALLOCARRAY
|
||||||
|
+
|
||||||
|
/**
|
||||||
|
* ALLOC_N_UNINITIALIZED:
|
||||||
|
* @ptr: pointer to allocated memory
|
||||||
|
@@ -112,6 +119,8 @@ safe_alloc_check (void *ptr)
|
||||||
|
#define REALLOC_N(ptr, count) \
|
||||||
|
safe_alloc_check ((ptr) = safe_alloc_realloc_n (ptr, count, sizeof *(ptr)))
|
||||||
|
|
||||||
|
+#endif /* GNULIB_REALLOCARRAY */
|
||||||
|
+
|
||||||
|
/**
|
||||||
|
* FREE:
|
||||||
|
* @ptr: pointer holding address to be freed
|
|
@ -8,7 +8,7 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=missing-macros
|
PKG_NAME:=missing-macros
|
||||||
PKG_RELEASE:=11
|
PKG_RELEASE:=12
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/host-build.mk
|
include $(INCLUDE_DIR)/host-build.mk
|
||||||
|
|
||||||
|
@ -23,6 +23,11 @@ define Host/Install
|
||||||
$(INSTALL_DATA) ./src/m4/*.m4 $(STAGING_DIR_HOST)/share/aclocal/
|
$(INSTALL_DATA) ./src/m4/*.m4 $(STAGING_DIR_HOST)/share/aclocal/
|
||||||
$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
|
$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
|
||||||
$(INSTALL_BIN) ./src/bin/* $(STAGING_DIR_HOST)/bin/
|
$(INSTALL_BIN) ./src/bin/* $(STAGING_DIR_HOST)/bin/
|
||||||
|
$(LN) makeinfo $(STAGING_DIR_HOST)/bin/texi2any
|
||||||
|
$(LN) makeinfo $(STAGING_DIR_HOST)/bin/texi2pdf
|
||||||
|
$(LN) makeinfo $(STAGING_DIR_HOST)/bin/texi2dvi
|
||||||
|
$(LN) makeinfo $(STAGING_DIR_HOST)/bin/pdftexi2dvi
|
||||||
|
$(LN) makeinfo $(STAGING_DIR_HOST)/bin/texi2html
|
||||||
endef
|
endef
|
||||||
|
|
||||||
$(eval $(call HostBuild))
|
$(eval $(call HostBuild))
|
||||||
|
|
Loading…
Reference in New Issue