Commit 2702db2a authored by Timo Teräs's avatar Timo Teräs

main/[various]: simple build fixes against musl (update_config_sub)

parent 5d990086
......@@ -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:' \
......
......@@ -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)
......
......@@ -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
......
......@@ -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"
......
......@@ -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"
......
......@@ -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 \
......
......@@ -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
......
......@@ -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;;
......
......@@ -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 \
......
......@@ -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;;
......
......@@ -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 \
......
......@@ -15,6 +15,11 @@ replaces="bitlib"
_builddir="$srcdir"/$_name-$pkgver
prepare() {
cd "$_builddir"
update_config_sub || return 1
}
build() {
cd "$_builddir"
./configure \
......
......@@ -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
......
......@@ -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 \
......
......@@ -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##*/}"
......
......@@ -21,6 +21,7 @@ _builddir="$srcdir/$pkgname-$pkgver"
prepare() {
cd "$_builddir"
./prepare-source || return 1
update_config_sub || return 1
}
build() {
......
......@@ -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"
......@@ -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() {
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment