diff options
-rwxr-xr-x | files/autoconf_2_69_host/bin/%[FNAME]-2.69 | 17 | ||||
-rw-r--r-- | groups.d/000.host_tools.group | 26 | ||||
-rw-r--r-- | patches/autoconf_2_69_host-2.69.local.patch | 84 |
3 files changed, 124 insertions, 3 deletions
diff --git a/files/autoconf_2_69_host/bin/%[FNAME]-2.69 b/files/autoconf_2_69_host/bin/%[FNAME]-2.69 new file mode 100755 index 00000000..0cd46b92 --- /dev/null +++ b/files/autoconf_2_69_host/bin/%[FNAME]-2.69 @@ -0,0 +1,17 @@ +#!/bin/sh + +AUTOTOOL_COMMAND="${0##*/}"; AUTOTOOL_COMMAND="${AUTOTOOL_COMMAND%-2.69}"; +PREFIX=""; [ ${PREFIX:="${0%/*}"} = "${0}" ] && PREFIX="."; PREFIX="${PREFIX:+${PREFIX}/}.."; +export ACLOCAL="${ACLOCAL:-${PREFIX}/binaclocal-1.11}"; +export AC_MACRODIR="${AC_MACRODIR:-${PREFIX}/share/autoconf-2.69}"; +export AUTOCONF="${AUTOCONF:-${PREFIX}/libexec/autoconf-2.69/autoconf}"; +export AUTOHEADER="${AUTOHEADER:-${PREFIX}/libexec/autoconf-2.69/autoheader}"; +export AUTOM4TE="${AUTOM4TE:-${PREFIX}/libexec/autoconf-2.69/autom4te}"; +export AUTOM4TE_CFG="${AUTOM4TE_CFG:-${PREFIX}/share/autoconf-2.69/autom4te.cfg}"; +export autom4te_perllibdir="${autom4te_perllibdir:-${PREFIX}/share/autoconf-2.69}"; +export AUTOMAKE="${AUTOMAKE:-${PREFIX}/bin/automake-1.11}"; +export AUTOPOINT="${AUTOPOINT:-${PREFIX}/libexec/autoconf-2.69/autopoint}"; +export LIBTOOLIZE="${LIBTOOLIZE:-${PREFIX}/libexec/autoconf-2.69/libtoolize}"; + +AUTOTOOL_COMMAND="${PREFIX}/libexec/autoconf-2.69/${AUTOTOOL_COMMAND}"; unset PREFIX; +exec "${AUTOTOOL_COMMAND}" "${@}"; diff --git a/groups.d/000.host_tools.group b/groups.d/000.host_tools.group index d2c5ee06..fab3296d 100644 --- a/groups.d/000.host_tools.group +++ b/groups.d/000.host_tools.group @@ -5,16 +5,36 @@ HOST_TOOLS_BUILD_TYPE="host"; HOST_TOOLS_CONFIGURE_ARGS="--disable-nls --prefix=${PREFIX}"; HOST_TOOLS_MAKEFLAGS_INSTALL="prefix= PREFIX="; HOST_TOOLS_PACKAGES=" -autoconf_host autoconf_2_64_host automake_host automake_1_11_6_host +autoconf_host autoconf_2_69_host autoconf_2_64_host automake_host automake_1_11_6_host gettext_tiny_host install_strip_host libtool_host m4_host pkgconf_host slibtool_host tpax_host"; HOST_TOOLS_PREFIX="${PREFIX}"; HOST_TOOLS_RPM_DISABLE=1; : ${PKG_AUTOCONF_HOST_DEPENDS:="m4_host pkgconf_host slibtool_host"}; -: ${PKG_AUTOCONF_HOST_SHA256SUM:=64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684}; -: ${PKG_AUTOCONF_HOST_VERSION:=2.69}; +: ${PKG_AUTOCONF_HOST_SHA256SUM:=f14c83cfebcc9427f2c3cea7258bd90df972d92eb26752da4ddad81c87a0faa4}; +: ${PKG_AUTOCONF_HOST_VERSION:=2.71}; : ${PKG_AUTOCONF_HOST_URL:=https://ftp.gnu.org/gnu/autoconf/autoconf-${PKG_AUTOCONF_HOST_VERSION}.tar.xz}; +: ${PKG_AUTOCONF_2_69_HOST_DEPENDS:="m4_host pkgconf_host slibtool_host"}; +: ${PKG_AUTOCONF_2_69_HOST_SHA256SUM:=64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684}; +: ${PKG_AUTOCONF_2_69_HOST_VERSION:=2.69}; +: ${PKG_AUTOCONF_2_69_HOST_URL:=https://ftp.gnu.org/gnu/autoconf/autoconf-${PKG_AUTOCONF_2_69_HOST_VERSION}.tar.xz}; +: ${PKG_AUTOCONF_2_69_HOST_INSTALL_FILES_V2:=" + /=libexec/autoconf-2.69 + !bin/%<*>=libexec/autoconf-2.69/%[FNAME] + +%[_files]/bin/\%[FNAME]-2.69=bin/autoconf-2.69 + +%[_files]/bin/\%[FNAME]-2.69=bin/autoheader-2.69 + +%[_files]/bin/\%[FNAME]-2.69=bin/autom4te-2.69 + +%[_files]/bin/\%[FNAME]-2.69=bin/autoreconf-2.69 + +%[_files]/bin/\%[FNAME]-2.69=bin/autoscan-2.69 + +%[_files]/bin/\%[FNAME]-2.69=bin/autoupdate-2.69 + +%[_files]/bin/\%[FNAME]-2.69=bin/ifnames-2.69 + !share/autoconf-2.69/autom4te.cfg=share/autoconf/autom4te.cfg + -=share/autoconf-2.69/ + !share/autoconf=share/autoconf-2.69/ + -=share/info/dir + !share/info/%<*.info>=share/info/%[FNAME%.info]-2.69.info + !share/man/man1/%<*.1>=share/man/man1/%[FNAME%.1]-2.69.1"} : ${PKG_AUTOCONF_2_64_HOST_DEPENDS:="m4_host pkgconf_host slibtool_host"}; : ${PKG_AUTOCONF_2_64_HOST_SHA256SUM:=32d977213320b8ae76c71175305301197f2b0e04e72d70694bc3d3e2ae6c7248}; : ${PKG_AUTOCONF_2_64_HOST_VERSION:=2.64}; diff --git a/patches/autoconf_2_69_host-2.69.local.patch b/patches/autoconf_2_69_host-2.69.local.patch new file mode 100644 index 00000000..b3120b66 --- /dev/null +++ b/patches/autoconf_2_69_host-2.69.local.patch @@ -0,0 +1,84 @@ +--- autoconf-2.64/bin/Makefile.in.orig 2009-07-27 04:28:43.000000000 +0100 ++++ autoconf-2.64/bin/Makefile.in 2021-05-06 23:48:43.296357404 +0100 +@@ -53,10 +53,10 @@ + # 02110-1301, USA. + + VPATH = @srcdir@ +-pkgdatadir = $(datadir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ +-pkglibexecdir = $(libexecdir)/@PACKAGE@ ++pkgdatadir = $(datadir)/@PACKAGE@-2.69 ++pkgincludedir = $(includedir)/@PACKAGE@-2.69 ++pkglibdir = $(libdir)/@PACKAGE@-2.69 ++pkglibexecdir = $(libexecdir)/@PACKAGE@-2.69 + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -283,9 +283,9 @@ + -e 's|@bindir[@]|$(bindir)|g' \ + -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' \ + -e 's|@prefix[@]|$(prefix)|g' \ +- -e 's|@autoconf-name[@]|'`echo autoconf | sed '$(transform)'`'|g' \ +- -e 's|@autoheader-name[@]|'`echo autoheader | sed '$(transform)'`'|g' \ +- -e 's|@autom4te-name[@]|'`echo autom4te | sed '$(transform)'`'|g' \ ++ -e 's|@autoconf-name[@]|'`echo autoconf-2.69 | sed '$(transform)'`'|g' \ ++ -e 's|@autoheader-name[@]|'`echo autoheader-2.69 | sed '$(transform)'`'|g' \ ++ -e 's|@autom4te-name[@]|'`echo autom4te-2.69 | sed '$(transform)'`'|g' \ + -e 's|@M4[@]|$(M4)|g' \ + -e 's|@M4_DEBUGFILE[@]|$(M4_DEBUGFILE)|g' \ + -e 's|@M4_GNU[@]|$(M4_GNU)|g' \ +--- autoconf-2.64/lib/Makefile.in.orig 2009-07-27 04:28:44.000000000 +0100 ++++ autoconf-2.64/lib/Makefile.in 2021-05-07 00:21:50.717431704 +0100 +@@ -34,10 +34,10 @@ + # along with this program. If not, see <http://www.gnu.org/licenses/>. + + VPATH = @srcdir@ +-pkgdatadir = $(datadir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ +-pkglibexecdir = $(libexecdir)/@PACKAGE@ ++pkgdatadir = $(datadir)/@PACKAGE@-2.69 ++pkgincludedir = $(includedir)/@PACKAGE@-2.69 ++pkglibdir = $(libdir)/@PACKAGE@-2.69 ++pkglibexecdir = $(libexecdir)/@PACKAGE@-2.69 + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -223,9 +223,9 @@ + -e 's|@bindir[@]|$(bindir)|g' \ + -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' \ + -e 's|@prefix[@]|$(prefix)|g' \ +- -e 's|@autoconf-name[@]|'`echo autoconf | sed '$(transform)'`'|g' \ +- -e 's|@autoheader-name[@]|'`echo autoheader | sed '$(transform)'`'|g' \ +- -e 's|@autom4te-name[@]|'`echo autom4te | sed '$(transform)'`'|g' \ ++ -e 's|@autoconf-name[@]|'`echo autoconf-2.69 | sed '$(transform)'`'|g' \ ++ -e 's|@autoheader-name[@]|'`echo autoheader-2.69 | sed '$(transform)'`'|g' \ ++ -e 's|@autom4te-name[@]|'`echo autom4te-2.69 | sed '$(transform)'`'|g' \ + -e 's|@M4[@]|$(M4)|g' \ + -e 's|@AWK[@]|$(AWK)|g' \ + -e 's|@VERSION[@]|$(VERSION)|g' \ +--- autoconf-2.69/man/Makefile.am 2022-12-27 15:22:52.186142107 +0800 ++++ autoconf-2.69/man/Makefile.am.orig 2012-01-21 21:46:39.000000000 +0800 +@@ -58,7 +58,8 @@ + --include=$*.x \ + --include=$(srcdir)/common.x \ + --source='$(PACKAGE_STRING)' \ +- --output=$@.t `echo '$*' | sed 's,.*/,,'` ++ --output=$@.t \ ++ --no-discard-stderr `echo '$*' | sed 's,.*/,,'` + if sed $(remove_time_stamp) $@ >$@a.t 2>/dev/null && \ + sed $(remove_time_stamp) $@.t | cmp $@a.t - >/dev/null 2>&1; then \ + touch $@; \ +--- autoconf-2.69/man/Makefile.in 2022-12-27 15:23:19.743692892 +0800 ++++ autoconf-2.69/man/Makefile.in.orig 2012-04-25 10:40:26.000000000 +0800 +@@ -464,7 +464,8 @@ + --include=$*.x \ + --include=$(srcdir)/common.x \ + --source='$(PACKAGE_STRING)' \ +- --output=$@.t `echo '$*' | sed 's,.*/,,'` ++ --output=$@.t \ ++ --no-discard-stderr `echo '$*' | sed 's,.*/,,'` + if sed $(remove_time_stamp) $@ >$@a.t 2>/dev/null && \ + sed $(remove_time_stamp) $@.t | cmp $@a.t - >/dev/null 2>&1; then \ + touch $@; \ |