From 0159b1c4453eef3d81e94bbac316a252049d5121 Mon Sep 17 00:00:00 2001
From: Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>
Date: Apr 13 2020 12:27:41 +0000
Subject: subr/pkg_build.subr: invariably call make(1) w/ V=99.

groups/*.group: remove redundant ${PKG_MAKEFLAGS_BUILD_EXTRA:="V=99"} variables.

---

diff --git a/groups/020.host_deps_rpm.group b/groups/020.host_deps_rpm.group
index c8c6453..e325a38 100644
--- a/groups/020.host_deps_rpm.group
+++ b/groups/020.host_deps_rpm.group
@@ -17,7 +17,6 @@ HOST_DEPS_RPM_PREFIX="${PREFIX}";
 : ${PKG_LIBARCHIVE_HOST_CFLAGS_CONFIGURE:="-I${PREFIX}/include"};
 : ${PKG_LIBARCHIVE_HOST_LDFLAGS_CONFIGURE:="-L${PREFIX}/lib"};
 : ${PKG_LIBARCHIVE_HOST_LIBTOOL:=rdlibtool};
-: ${PKG_LIBARCHIVE_HOST_MAKEFLAGS_BUILD_EXTRA:="V=99"};
 : ${PKG_LMDB_HOST_URLS_GIT:="lmdb=https://github.com/Redfoxmoon3/lmdb.git@mdb.master"};
 : ${PKG_LMDB_HOST_IN_TREE:=1};
 : ${PKG_POPT_HOST_SHA256SUM:=e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8};
diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group
index 8c4ab46..65a8b22 100644
--- a/groups/241.native_packages_inet.group
+++ b/groups/241.native_packages_inet.group
@@ -35,7 +35,6 @@ pacman rsync socat thttpd w3m weechat wget whois")";
 : ${PKG_CURL_VERSION:=7.61.0};
 : ${PKG_CURL_URL:=https://curl.haxx.se/download/curl-${PKG_CURL_VERSION}.tar.xz};
 : ${PKG_CURL_CONFIGURE_ARGS_EXTRA:="--disable-symbol-hiding --enable-shared --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --with-ca-path=/etc/ssl/certs --with-gnutls --without-ssl"};
-: ${PKG_CURL_MAKEFLAGS_BUILD_EXTRA:="V=99"};
 : ${PKG_DROPBEAR_DEPENDS:="libz"};
 : ${PKG_DROPBEAR_SHA256SUM:=525965971272270995364a0eb01f35180d793182e63dd0b0c3eb0292291644a4};
 : ${PKG_DROPBEAR_VERSION:=2019.78};
@@ -51,7 +50,7 @@ pacman rsync socat thttpd w3m weechat wget whois")";
 : ${PKG_GIT_VERSION:=2.17.1};
 : ${PKG_GIT_URL:=https://github.com/git/git/archive/v${PKG_GIT_VERSION}.tar.gz};
 : ${PKG_GIT_IN_TREE:=1};
-: ${PKG_GIT_MAKEFLAGS_BUILD:="HAVE_DEV_TTY=yes NO_REGEX=yes NO_PERL=yes NO_PYTHON=yes NO_TCLTK=yes V=99"};
+: ${PKG_GIT_MAKEFLAGS_BUILD:="HAVE_DEV_TTY=yes NO_REGEX=yes NO_PERL=yes NO_PYTHON=yes NO_TCLTK=yes"};
 : ${PKG_GIT_SUBDIR:=git-${PKG_GIT_VERSION}};
 : ${PKG_GNUPG_DEPENDS:="libassuan libgcrypt libgpg_error libksba npth sqlite3"};
 : ${PKG_GNUPG_SHA256SUM:=242554c0e06f3a83c420b052f750b65ead711cc3fddddb5e7274fcdbb4e9dec0};
diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group
index e049ef1..642e879 100644
--- a/groups/251.native_packages_lib.group
+++ b/groups/251.native_packages_lib.group
@@ -19,7 +19,6 @@ libxslt libz libzip")";
 : ${PKG_LIBARCHIVE_URL:=http://www.libarchive.org/downloads/libarchive-${PKG_LIBARCHIVE_VERSION}.tar.gz};
 : ${PKG_LIBARCHIVE_LDFLAGS_CONFIGURE_EXTRA:=-L${PREFIX_NATIVE}/lib};
 : ${PKG_LIBARCHIVE_LIBTOOL:=rdlibtool};
-: ${PKG_LIBARCHIVE_MAKEFLAGS_BUILD_EXTRA:="V=99"};
 : ${PKG_LIBASR_SHA256SUM:=9cd88e0172e6d426438875e09229d1d473d56db546d02b630f9dd14db226d68d};
 : ${PKG_LIBASR_VERSION:=1.0.3};
 : ${PKG_LIBASR_URL:=https://www.opensmtpd.org/archives/libasr-${PKG_LIBASR_VERSION}.tar.gz};
diff --git a/groups/261.native_packages_x11.group b/groups/261.native_packages_x11.group
index daffe83..b6360cd 100644
--- a/groups/261.native_packages_x11.group
+++ b/groups/261.native_packages_x11.group
@@ -308,6 +308,5 @@ xtrans xwd xwin")";
 : ${PKG_XWIN_CONFIGURE_ARGS_EXTRA:="--enable-xwin --disable-xorg --disable-dri --disable-dri2 --disable-dri3 --disable-pciaccess --disable-glx"};
 : ${PKG_XWIN_DISABLED:=1};
 : ${PKG_XWIN_LDFLAGS_CONFIGURE_EXTRA:="-L${PREFIX_NATIVE}/lib/w32lib/"};
-: ${PKG_XWIN_MAKEFLAGS_BUILD_EXTRA:=V=99};
 
 # vim:filetype=sh textwidth=0
diff --git a/groups/dev_packages.group b/groups/dev_packages.group
index 4446a7f..8a9ab76 100644
--- a/groups/dev_packages.group
+++ b/groups/dev_packages.group
@@ -41,7 +41,7 @@ DEV_PACKAGES_PYTHON="${PREFIX}/bin/python2";
 : ${PKG_GIT_VERSION:=2.17.1};
 : ${PKG_GIT_URL:=https://github.com/git/git/archive/v${PKG_GIT_VERSION}.tar.gz};
 : ${PKG_GIT_IN_TREE:=1};
-: ${PKG_GIT_MAKEFLAGS_BUILD:="HAVE_DEV_TTY=yes NO_REGEX=yes NO_PERL=yes NO_PYTHON=yes NO_TCLTK=yes V=99"};
+: ${PKG_GIT_MAKEFLAGS_BUILD:="HAVE_DEV_TTY=yes NO_REGEX=yes NO_PERL=yes NO_PYTHON=yes NO_TCLTK=yes"};
 : ${PKG_GIT_SUBDIR:=git-${PKG_GIT_VERSION}};
 : ${PKG_MAKE_SHA256SUM:=e40b8f018c1da64edd1cc9a6fce5fa63b2e707e404e20cad91fbae337c98a5b7};
 : ${PKG_MAKE_VERSION:=4.2.1};
diff --git a/subr/pkg_build.subr b/subr/pkg_build.subr
index eeb6ae5..61b504a 100644
--- a/subr/pkg_build.subr
+++ b/subr/pkg_build.subr
@@ -29,7 +29,8 @@ pkg_build() {
 		"${PKG_LDFLAGS_BUILD_EXTRA:+LDFLAGS+=${PKG_LDFLAGS_BUILD_EXTRA}}"	\
 		"${PKG_PKG_CONFIG:+PKG_CONFIG=${PKG_PKG_CONFIG}}"			\
 		"${PKG_PKG_CONFIG_LIBDIR:+PKG_CONFIG_LIBDIR=${PKG_PKG_CONFIG_LIBDIR}}"	\
-		${_libtool:+"LIBTOOL=${_libtool}"};
+		${_libtool:+"LIBTOOL=${_libtool}"}					\
+		V=99;
 };
 
 # vim:filetype=sh