Git v2.9.0: use the supplied configure.ac script to build.

- Call autoconf in ${PKG_SUBDIR} if ${PKG_AUTOCONF} is set; additionally
  copies config.sub to ${PKG_SUBDIR}/build-aux if the latter is present.

2 files changed, 25 insertions, 21 deletions

diff --git a/build.vars b/build.vars
index 8019b916..345d4e8a 100644
--- a/build.vars
+++ b/build.vars
@@ -53,7 +53,7 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
 : ${WORKDIR:=${PREFIX}/tmp};
 
 : ${PKG_BUILD_NAMES:="apk_tools bash binutils binutils_host bzip2 coreutils curl dalist dash diffutils findutils gawk git glib gmp grep gzip hexcurse inetutils irssi less libarchive libelf libfetch libffi libnbcompat libressl libz lua make mksh mpc mpfr nano ncurses ncursestw ncursesw netcat ntapi ntcon ntctty openssh pacman patch pemagine perl pkgconf pkgconf_host popt psxscl psxstub psxtypes python3 rsync sed slibtool tar tcsh util_linux which xz zsh"};
-: ${PKG_BUILD_VARS:="AR_BUILD AR_CONFIGURE AR_INSTALL AUTOGEN BUILD_DIR BUILD_TYPE CC_BUILD CC_CONFIGURE CC_INSTALL CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA CFLAGS_INSTALL_EXTRA CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA ENV_VARS_EXTRA FNAME GIT_ARGS_EXTRA INSTALL_TARGET LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE LDFLAGS_CONFIGURE_EXTRA LDFLAGS_INSTALL_EXTRA LIBFILES_FIX LIBTOOL_MIDIPIX LIBTOOL_MIDIPIX_FIX MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA NO_CLEAN PATCHES_EXTRA_URL PREFIX_EXTRA RANLIB_BUILD RANLIB_INSTALL SHA256SUM SLIBTOOL SUBDIR SUBDIR_CREATE URL URL_FNAME URL_TYPE VERSION"};
+: ${PKG_BUILD_VARS:="AR_BUILD AR_CONFIGURE AR_INSTALL AUTOCONF AUTOGEN BUILD_DIR BUILD_TYPE CC_BUILD CC_CONFIGURE CC_INSTALL CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA CFLAGS_INSTALL_EXTRA CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA ENV_VARS_EXTRA FNAME GIT_ARGS_EXTRA INSTALL_TARGET LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE LDFLAGS_CONFIGURE_EXTRA LDFLAGS_INSTALL_EXTRA LIBFILES_FIX LIBTOOL_MIDIPIX LIBTOOL_MIDIPIX_FIX MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA NO_CLEAN PATCHES_EXTRA_URL PREFIX_EXTRA RANLIB_BUILD RANLIB_INSTALL SHA256SUM SLIBTOOL SUBDIR SUBDIR_CREATE URL URL_FNAME URL_TYPE VERSION"};
 : ${PKG_LVL0_CFLAGS_CONFIGURE:=-O0};
 : ${PKG_LVL0_CONFIGURE_ARGS:="-C --disable-nls --host=${HOST_NATIVE} --prefix= --target=${TARGET}"};
 : ${PKG_LVL0_MAKEFLAGS_BUILD:=${MAKEFLAGS_DEFAULT}};
@@ -136,23 +136,15 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
 : ${PKG_GAWK_SHA256SUM:=e3cf55e91e31ea2845f8338bedd91e40671fc30e4d82ea147d220e687abda625};
 : ${PKG_GAWK_URL:=https://ftp.gnu.org/gnu/gawk/gawk-${PKG_GAWK_VERSION}.tar.xz};
 : ${PKG_GCC_VERSION:=4.6.4};
-: ${PKG_GIT_AR_BUILD:=${HOST_NATIVE}-ar};
-: ${PKG_GIT_AR_INSTALL:=${HOST_NATIVE}-ar};
-: ${PKG_GIT_BUILD_DIR:=git};
-: ${PKG_GIT_CC_BUILD:=${HOST_NATIVE}-gcc};
-: ${PKG_GIT_CC_INSTALL:=${HOST_NATIVE}-gcc};
-: ${PKG_GIT_CFLAGS_BUILD_EXTRA:=--sysroot=${PREFIX_LVL3} -I.};
-: ${PKG_GIT_CFLAGS_INSTALL_EXTRA:=--sysroot=${PREFIX_LVL3} -I.};
-: ${PKG_GIT_GIT_ARGS_EXTRA:=--branch v2.7.1};
-: ${PKG_GIT_LDFLAGS_BUILD_EXTRA:=--sysroot=${PREFIX_LVL3}};
-: ${PKG_GIT_LDFLAGS_INSTALL_EXTRA:=--sysroot=${PREFIX_LVL3}};
-: ${PKG_GIT_LIBFILES_FIX:=1};
-: ${PKG_GIT_MAKEFLAGS_BUILD_EXTRA:=NEEDS_SSL_WITH_CURL=1 NO_EXPAT=1 NO_PERL=1 prefix=${PREFIX_LVL3} V=99};
-: ${PKG_GIT_MAKEFLAGS_INSTALL:=NEEDS_SSL_WITH_CURL=1 NO_EXPAT=1 NO_PERL=1 prefix=${PREFIX_LVL3} V=99};
-: ${PKG_GIT_RANLIB_INSTALL:=${HOST_NATIVE}-ranlib};
-: ${PKG_GIT_SUBDIR:=git};
-: ${PKG_GIT_URL:=https://github.com/git/git.git};
-: ${PKG_GIT_URL_TYPE:=git};
+: ${PKG_GIT_VERSION:=2.9.0};
+: ${PKG_GIT_SHA256SUM:=dad202c1a2dec4caa2a6cab5c1ca8dc486206fd4a39585613bece8aa8c9da93b};
+: ${PKG_GIT_URL:=https://github.com/git/git/archive/v${PKG_GIT_VERSION}.tar.gz};
+: ${PKG_GIT_AUTOCONF:=1};
+: ${PKG_GIT_ENV_VARS_EXTRA:="ac_cv_fread_reads_directories=1:ac_cv_snprintf_returns_bogus=0"};
+: ${PKG_GIT_BUILD_DIR:=git-${PKG_GIT_VERSION}};
+: ${PKG_GIT_MAKEFLAGS_BUILD_EXTRA:=V=99};
+: ${PKG_GIT_MAKEFLAGS_INSTALL_EXTRA:="prefix=:V=99"};
+: ${PKG_GIT_SUBDIR:=${PKG_GIT_BUILD_DIR}};
 : ${PKG_GLIB_VERSION:=2.46.2};
 : ${PKG_GLIB_SHA256SUM:=5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db};
 : ${PKG_GLIB_URL:=http://ftp.gnome.org/pub/GNOME/sources/glib/${PKG_GLIB_VERSION%.[0-9]}/glib-${PKG_GLIB_VERSION}.tar.xz};
diff --git a/pkg.build b/pkg.build
index 6d96ca7f..b5b86991 100644
--- a/pkg.build
+++ b/pkg.build
@@ -53,9 +53,21 @@ if ! is_build_script_done build_dir; then
 fi;
 if ! is_build_script_done patch; then
 	if [ ${PKG_AUTOGEN:-0} -eq 1 ]; then
-		cd ${PKG_SUBDIR} &&				\
-		install -m 0700 ${MIDIPIX_BUILD_PWD}/config.sub build-aux/ &&\
-				./autogen.sh && cd ${OLDPWD};
+		if [ -d ${PKG_SUBDIR}/build-aux ]; then
+			install -m 0700 ${MIDIPIX_BUILD_PWD}/config.sub			\
+				${PKG_SUBDIR}/build-aux;
+		fi;
+		if [ -x ${PKG_SUBDIR}/autogen.sh ]; then
+			(cd ${PKG_SUBDIR} && ./autogen.sh) || exit 1;
+		fi;
+	elif [ ${PKG_AUTOCONF:-0} -eq 1 ]; then
+		if [ -d ${PKG_SUBDIR}/build-aux ]; then
+			install -m 0700 ${MIDIPIX_BUILD_PWD}/config.sub			\
+				${PKG_SUBDIR}/build-aux;
+		fi;
+		if [ -r ${PKG_SUBDIR}/configure.ac ]; then
+			(cd ${PKG_SUBDIR} && autoconf) || exit 1;
+		fi;
 	fi;
 	for PATCH_FNAME in portage/${PKG_SUBDIR}.midipix.patch				\
 			${MIDIPIX_BUILD_PWD}/${PKG_SUBDIR}.local.patch			\