From 2702db2a9ba4bb1f2ef819ae61c791477748784f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Fri, 20 Sep 2013 13:01:09 +0000
Subject: main/[various]: simple build fixes against musl (update_config_sub)

---
 main/acl/APKBUILD        |  1 +
 main/autoconf/APKBUILD   |  1 +
 main/bash/APKBUILD       |  1 +
 main/expat/APKBUILD      |  1 +
 main/flex/APKBUILD       |  5 +++++
 main/gawk/APKBUILD       |  9 +++++++--
 main/gdb/APKBUILD        |  2 +-
 main/gdbm/APKBUILD       |  1 +
 main/libevent/APKBUILD   |  5 +++++
 main/libssh2/APKBUILD    |  1 +
 main/libtool/APKBUILD    |  5 +++++
 main/lua-bitlib/APKBUILD |  5 +++++
 main/ncurses/APKBUILD    |  5 +++++
 main/popt/APKBUILD       |  5 +++++
 main/readline/APKBUILD   |  1 +
 main/rsync/APKBUILD      |  1 +
 main/sed/APKBUILD        |  9 +++++++++
 main/sqlite/APKBUILD     |  1 +
 main/tar/APKBUILD        | 13 +++++++++----
 19 files changed, 65 insertions(+), 7 deletions(-)

diff --git a/main/acl/APKBUILD b/main/acl/APKBUILD
index de8153af4a..5b382c5496 100644
--- a/main/acl/APKBUILD
+++ b/main/acl/APKBUILD
@@ -13,6 +13,7 @@ source="http://download.savannah.gnu.org/releases-noredirect/acl/acl-$pkgver.src
 
 prepare() {
 	cd "$srcdir"/acl-$pkgver
+	update_config_sub || return 1
 	#libtoolize --force && aclocal -I m4 && autoconf && autoheader
 	sed -i \
 		-e '/^as_dummy=/s:=":="$PATH$PATH_SEPARATOR:' \
diff --git a/main/autoconf/APKBUILD b/main/autoconf/APKBUILD
index b29fadad06..7b7e90dee8 100644
--- a/main/autoconf/APKBUILD
+++ b/main/autoconf/APKBUILD
@@ -13,6 +13,7 @@ subpackages="$pkgname-doc"
 
 prepare() {
 	cd "$srcdir"/$pkgname-$pkgver
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch)
diff --git a/main/bash/APKBUILD b/main/bash/APKBUILD
index c0f7b3ff7d..84e55c1810 100644
--- a/main/bash/APKBUILD
+++ b/main/bash/APKBUILD
@@ -39,6 +39,7 @@ _builddir="$srcdir"/$pkgname-$_myver
 prepare() {
 	local p
 	cd "$_builddir"
+	update_config_sub || return 1
 	for p in ../bash${_patchbase}-??? ../*.patch; do
 		msg "applying patch ${p##*/}"
 		patch -p0 -i $p || return 1
diff --git a/main/expat/APKBUILD b/main/expat/APKBUILD
index daf4313f6c..d967dffd2d 100644
--- a/main/expat/APKBUILD
+++ b/main/expat/APKBUILD
@@ -15,6 +15,7 @@ subpackages="$pkgname-dev $pkgname-doc"
 _builddir="$srcdir/$pkgname-$pkgver"
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in "$srcdir"/*.patch; do
 		[ -f "$i" ] || continue
 		msg "Applying $i"
diff --git a/main/flex/APKBUILD b/main/flex/APKBUILD
index 669a70d8e5..d06e87424a 100644
--- a/main/flex/APKBUILD
+++ b/main/flex/APKBUILD
@@ -11,6 +11,11 @@ makedepends=m4
 source="http://downloads.sourceforge.net/sourceforge/flex/flex-$pkgver.tar.bz2"
 subpackages="$pkgname-doc"
 
+prepare() {
+	cd "$srcdir/$pkgname-$pkgver"
+	update_config_sub || return 1
+}
+
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
diff --git a/main/gawk/APKBUILD b/main/gawk/APKBUILD
index d824436158..84e8f4497b 100644
--- a/main/gawk/APKBUILD
+++ b/main/gawk/APKBUILD
@@ -11,9 +11,14 @@ license="GPL"
 subpackages="$pkgname-doc"
 source="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"
 
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
+_builddir="$srcdir/$pkgname-$pkgver"
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
 
+build() {
+	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
diff --git a/main/gdb/APKBUILD b/main/gdb/APKBUILD
index b0130466c0..f814283946 100644
--- a/main/gdb/APKBUILD
+++ b/main/gdb/APKBUILD
@@ -49,7 +49,7 @@ build () {
 	[ "$CBUILD" = "$CHOST" ] && _config="$_config --with-system-readline"
 
 	# gdb server does not compile with musl
-	[ "${CHOST#*musl}" != "$CHOST" ] &&  _config="$_config --disable-gdbserver"
+	[ "$CTARGET_LIBC" = musl ] &&  _config="$_config --disable-gdbserver"
 
 	./configure $_config || return 1
 	(cd opcodes && ./configure $_config) || return 1
diff --git a/main/gdbm/APKBUILD b/main/gdbm/APKBUILD
index d6b820cd47..344a3a7f93 100644
--- a/main/gdbm/APKBUILD
+++ b/main/gdbm/APKBUILD
@@ -17,6 +17,7 @@ source="ftp://ftp.nluug.nl/pub/gnu/gdbm/gdbm-$pkgver.tar.gz
 _builddir="$srcdir"/gdbm-$pkgver
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/libevent/APKBUILD b/main/libevent/APKBUILD
index f031f8cb37..b4a933d9bb 100644
--- a/main/libevent/APKBUILD
+++ b/main/libevent/APKBUILD
@@ -13,6 +13,11 @@ subpackages="$pkgname-dev"
 source="https://github.com/downloads/libevent/libevent/libevent-$pkgver-stable.tar.gz"
 _builddir="$srcdir"/$pkgname-$pkgver-stable
 
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
 	cd "$_builddir"
 	./configure \
diff --git a/main/libssh2/APKBUILD b/main/libssh2/APKBUILD
index ca69b55a73..bbe3d29a78 100644
--- a/main/libssh2/APKBUILD
+++ b/main/libssh2/APKBUILD
@@ -18,6 +18,7 @@ _builddir="$srcdir"/libssh2-$pkgver
 prepare() {
 	local i
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
diff --git a/main/libtool/APKBUILD b/main/libtool/APKBUILD
index d91cfe41dc..b3cdf0a143 100644
--- a/main/libtool/APKBUILD
+++ b/main/libtool/APKBUILD
@@ -11,6 +11,11 @@ depends="bash libltdl"
 subpackages="libltdl $pkgname-doc"
 options="libtool"
 
+prepare() {
+	cd "$srcdir"/$pkgname-$pkgver
+	update_config_sub || return 1
+}
+
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
diff --git a/main/lua-bitlib/APKBUILD b/main/lua-bitlib/APKBUILD
index 0c8fd57235..da6977fa13 100644
--- a/main/lua-bitlib/APKBUILD
+++ b/main/lua-bitlib/APKBUILD
@@ -15,6 +15,11 @@ replaces="bitlib"
 
 _builddir="$srcdir"/$_name-$pkgver
 
+prepare() {
+	cd "$_builddir"
+	update_config_sub || return 1
+}
+
 build() {
 	cd "$_builddir"
 	./configure \
diff --git a/main/ncurses/APKBUILD b/main/ncurses/APKBUILD
index 341212dc30..fc599b8fc8 100644
--- a/main/ncurses/APKBUILD
+++ b/main/ncurses/APKBUILD
@@ -11,6 +11,11 @@ source="ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-base $pkgname-terminfo 
 	$pkgname-widec-libs:widec $pkgname-libs"
 
+prepare() {
+	cd "$srcdir/$pkgname-$pkgver"
+	update_config_sub || return 1
+}
+
 build() {
 	local _confopts="
 		--build=$CBUILD
diff --git a/main/popt/APKBUILD b/main/popt/APKBUILD
index e5d902c44e..3263cb74eb 100644
--- a/main/popt/APKBUILD
+++ b/main/popt/APKBUILD
@@ -11,6 +11,11 @@ makedepends="!libiconv-dev"
 source="http://rpm5.org/files/$pkgname/$pkgname-$pkgver.tar.gz"
 subpackages="$pkgname-doc $pkgname-dev"
 
+prepare() {
+	cd "$srcdir"/$pkgname-$pkgver
+	update_config_sub || return 1
+}
+
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 	./configure \
diff --git a/main/readline/APKBUILD b/main/readline/APKBUILD
index 12fa5501ba..7625fee8b0 100644
--- a/main/readline/APKBUILD
+++ b/main/readline/APKBUILD
@@ -25,6 +25,7 @@ done
 _builddir="$srcdir"/$pkgname-$_myver
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 	for i in "$srcdir"/readline$_suff-???; do
 		[ -r "$i" ] || continue
 		msg "Applying ${i##*/}"
diff --git a/main/rsync/APKBUILD b/main/rsync/APKBUILD
index 858a7f6018..c5e76730cf 100644
--- a/main/rsync/APKBUILD
+++ b/main/rsync/APKBUILD
@@ -21,6 +21,7 @@ _builddir="$srcdir/$pkgname-$pkgver"
 prepare() {
 	cd "$_builddir"
 	./prepare-source || return 1
+	update_config_sub || return 1
 }
 
 build() {
diff --git a/main/sed/APKBUILD b/main/sed/APKBUILD
index f2e2b1422e..4043b13fd3 100644
--- a/main/sed/APKBUILD
+++ b/main/sed/APKBUILD
@@ -12,6 +12,11 @@ makedepends=""
 install="$pkgname.post-deinstall"
 source="ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
 
+prepare() {
+	cd "$srcdir/$pkgname-$pkgver"
+	update_config_sub || return 1
+}
+
 build() { 
 	cd "$srcdir/$pkgname-$pkgver"
 	./configure \
@@ -30,6 +35,10 @@ build() {
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
+
+	rm -rf "$pkgdir"/usr/lib/charset.alias
+	rmdir -p "$pkgdir"/usr/lib 2>/dev/null
+	return 0
 }
 
 md5sums="4111de4faa3b9848a0686b2f260c5056  sed-4.2.2.tar.gz"
diff --git a/main/sqlite/APKBUILD b/main/sqlite/APKBUILD
index 169f729c87..4dc412e7cc 100644
--- a/main/sqlite/APKBUILD
+++ b/main/sqlite/APKBUILD
@@ -31,6 +31,7 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname-libs"
 _builddir="$srcdir"/$pkgname-autoconf-$_ver
 prepare() {
 	cd "$_builddir"
+	update_config_sub || return 1
 }
 
 build() {
diff --git a/main/tar/APKBUILD b/main/tar/APKBUILD
index a9f28dbe29..1709173a28 100644
--- a/main/tar/APKBUILD
+++ b/main/tar/APKBUILD
@@ -13,10 +13,11 @@ source="ftp://ftp.gnu.org/gnu/tar/$pkgname-$pkgver.tar.gz"
 subpackages="$pkgname-doc"
 
 prepare() {
-        cd "$srcdir/$pkgname-$pkgver"
-        # fix eglibc-2.16+ build issue
-        sed -i -e '/gets is a/d' \
-                gnu/stdio.in.h || return 1
+	cd "$srcdir/$pkgname-$pkgver"
+	update_config_sub || return 1
+	# fix eglibc-2.16+ build issue
+	sed -i -e '/gets is a/d' \
+		gnu/stdio.in.h || return 1
 }
 
 build() {
@@ -34,6 +35,10 @@ build() {
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir/" install
+
+	rm -rf "$pkgdir"/usr/lib/charset.alias
+	rmdir -p "$pkgdir"/usr/lib 2>/dev/null
+
 	mkdir "$pkgdir"/bin
 	mv "$pkgdir"/usr/bin/tar "$pkgdir"/bin/
 	ln -s /bin/tar "$pkgdir"/usr/bin/tar
-- 
cgit v1.2.3