Commit 8f6f2e31 authored by Timo Teräs's avatar Timo Teräs

main/[various]: update config.sub (and remove charset.alias)

for musl build. the changes are automatically done based on previous
build log errors, so this does not guarantee successful build, but
is a required.
parent 832a032d
...@@ -22,6 +22,7 @@ source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz ...@@ -22,6 +22,7 @@ source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz
prepare() { prepare() {
cd "$srcdir"/$pkgname-$pkgver cd "$srcdir"/$pkgname-$pkgver
update_config_sub || return 1
for i in $source; do for i in $source; do
case $i in case $i in
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
......
...@@ -20,6 +20,7 @@ _builddir="$srcdir"/$pkgname-$pkgver ...@@ -20,6 +20,7 @@ _builddir="$srcdir"/$pkgname-$pkgver
prepare() { prepare() {
cd "$_builddir" cd "$_builddir"
update_config_sub || return 1
for i in $source; do for i in $source; do
case $i in case $i in
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
......
...@@ -14,8 +14,15 @@ install= ...@@ -14,8 +14,15 @@ install=
source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz source="ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz
libmath.patch" libmath.patch"
_builddir="$srcdir/$pkgname-$pkgver"
prepare() {
cd "$_builddir"
update_config_sub || return 1
}
build() { build() {
cd "$srcdir"/$pkgname-$pkgver cd "$_builddir"
./configure \ ./configure \
--build=$CBUILD \ --build=$CBUILD \
--host=$CHOST \ --host=$CHOST \
...@@ -29,7 +36,7 @@ build() { ...@@ -29,7 +36,7 @@ build() {
} }
package() { package() {
cd "$srcdir"/$pkgname-$pkgver cd "$_builddir"
make DESTDIR="$pkgdir" install || return 1 make DESTDIR="$pkgdir" install || return 1
rm "$pkgdir"/usr/lib/aspell*/*.la \ rm "$pkgdir"/usr/lib/aspell*/*.la \
"$pkgdir"/usr/lib/*.la || return 1 "$pkgdir"/usr/lib/*.la || return 1
......
...@@ -16,6 +16,7 @@ source="http://download.augeas.net/augeas-$pkgver.tar.gz" ...@@ -16,6 +16,7 @@ source="http://download.augeas.net/augeas-$pkgver.tar.gz"
_builddir="$srcdir"/$pkgname-$pkgver _builddir="$srcdir"/$pkgname-$pkgver
prepare() { prepare() {
cd "$_builddir" cd "$_builddir"
update_config_sub || return 1
for i in $source; do for i in $source; do
case $i in case $i in
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
...@@ -44,6 +45,8 @@ build() { ...@@ -44,6 +45,8 @@ build() {
package() { package() {
cd "$_builddir" cd "$_builddir"
make DESTDIR="$pkgdir" install || return 1 make DESTDIR="$pkgdir" install || return 1
rm -rf "$pkgdir"/usr/lib/charset.alias
rmdir -p "$pkgdir"/usr/lib 2>/dev/null
rm "$pkgdir"/usr/lib/*.la || return 1 rm "$pkgdir"/usr/lib/*.la || return 1
} }
......
...@@ -14,6 +14,7 @@ source="http://jpj.net/~trevor/aumix/releases/aumix-$pkgver.tar.bz2 ...@@ -14,6 +14,7 @@ source="http://jpj.net/~trevor/aumix/releases/aumix-$pkgver.tar.bz2
prepare() { prepare() {
cd "$srcdir"/aumix-$pkgver cd "$srcdir"/aumix-$pkgver
update_config_sub || return 1
} }
build() { build() {
......
...@@ -11,8 +11,15 @@ makedepends= ...@@ -11,8 +11,15 @@ makedepends=
subpackages="$pkgname-dev" subpackages="$pkgname-dev"
source="ftp://ftp.gimp.org/pub/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2" source="ftp://ftp.gimp.org/pub/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2"
_builddir="$srcdir/$pkgname-$pkgver"
prepare() {
cd "$_builddir"
update_config_sub || return 1
}
build() { build() {
cd "$srcdir"/$pkgname-$pkgver cd "$_builddir"
./configure \ ./configure \
--build=$CBUILD \ --build=$CBUILD \
--host=$CHOST \ --host=$CHOST \
...@@ -22,7 +29,7 @@ build() { ...@@ -22,7 +29,7 @@ build() {
} }
package() { package() {
cd "$srcdir"/$pkgname-$pkgver cd "$_builddir"
make DESTDIR="$pkgdir" install || return 1 make DESTDIR="$pkgdir" install || return 1
rm "$pkgdir"/usr/lib/babl*/*.la \ rm "$pkgdir"/usr/lib/babl*/*.la \
"$pkgdir"/usr/lib/*.la || return 1 "$pkgdir"/usr/lib/*.la || return 1
......
...@@ -32,6 +32,7 @@ _builddir="$srcdir/$_realname-$pkgver" ...@@ -32,6 +32,7 @@ _builddir="$srcdir/$_realname-$pkgver"
prepare () { prepare () {
cd "$_builddir" cd "$_builddir"
update_config_sub || return 1
for i in $source; do for i in $source; do
case $i in case $i in
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
......
...@@ -38,6 +38,7 @@ _builddir="$srcdir/$pkgname-$pkgver" ...@@ -38,6 +38,7 @@ _builddir="$srcdir/$pkgname-$pkgver"
prepare () { prepare () {
cd "$_builddir" cd "$_builddir"
update_config_sub || return 1
for i in $source; do for i in $source; do
case $i in case $i in
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
......
...@@ -10,8 +10,15 @@ depends="" ...@@ -10,8 +10,15 @@ depends=""
makedepends="" makedepends=""
source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.tar.bz2" source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.tar.bz2"
_builddir="$srcdir/$pkgname-$pkgver"
prepare() {
cd "$_builddir"
update_config_sub || return 1
}
build() { build() {
cd "$srcdir"/$pkgname-$pkgver cd "$_builddir"
./configure \ ./configure \
--build=$CBUILD \ --build=$CBUILD \
--host=$CHOST \ --host=$CHOST \
...@@ -21,7 +28,7 @@ build() { ...@@ -21,7 +28,7 @@ build() {
} }
package() { package() {
cd "$srcdir"/$pkgname-$pkgver cd "$_builddir"
make DESTDIR="$pkgdir" install || return 1 make DESTDIR="$pkgdir" install || return 1
} }
md5sums="1a05fb01fa1d5198894c931cf925c025 bigreqsproto-1.1.2.tar.bz2" md5sums="1a05fb01fa1d5198894c931cf925c025 bigreqsproto-1.1.2.tar.bz2"
...@@ -16,6 +16,11 @@ source="http://downloads.xiph.org/releases/cdparanoia/$pkgname-III-$pkgver.src.t ...@@ -16,6 +16,11 @@ source="http://downloads.xiph.org/releases/cdparanoia/$pkgname-III-$pkgver.src.t
$patches" $patches"
_builddir="$srcdir/cdparanoia-III-$pkgver" _builddir="$srcdir/cdparanoia-III-$pkgver"
prepare() {
cd "$_builddir"
update_config_sub || return 1
}
prepare() { prepare() {
cd "$_builddir" cd "$_builddir"
for i in $patches; do for i in $patches; do
...@@ -29,6 +34,13 @@ prepare() { ...@@ -29,6 +34,13 @@ prepare() {
libtoolize || return 1 libtoolize || return 1
} }
_builddir="$srcdir/$pkgname-$pkgver"
prepare() {
cd "$_builddir"
update_config_sub || return 1
}
build() { build() {
cd "$_builddir" cd "$_builddir"
./configure \ ./configure \
......
...@@ -17,6 +17,7 @@ _builddir="$srcdir"/celt-$pkgver ...@@ -17,6 +17,7 @@ _builddir="$srcdir"/celt-$pkgver
prepare() { prepare() {
local i local i
cd "$_builddir" cd "$_builddir"
update_config_sub || return 1
for i in $source; do for i in $source; do
case $i in case $i in
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
......
...@@ -15,6 +15,11 @@ subpackages="$pkgname-dev $pkgname-doc" ...@@ -15,6 +15,11 @@ subpackages="$pkgname-dev $pkgname-doc"
source="http://downloads.sourceforge.net/check/check-$pkgver.tar.gz" source="http://downloads.sourceforge.net/check/check-$pkgver.tar.gz"
_builddir="$srcdir"/check-$pkgver _builddir="$srcdir"/check-$pkgver
prepare() {
cd "$_builddir"
update_config_sub || return 1
}
build() { build() {
cd "$_builddir" cd "$_builddir"
./configure \ ./configure \
......
...@@ -16,6 +16,7 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" ...@@ -16,6 +16,7 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
_builddir="$srcdir"/$pkgname-$pkgver _builddir="$srcdir"/$pkgname-$pkgver
prepare() { prepare() {
cd "$_builddir" cd "$_builddir"
update_config_sub || return 1
} }
build() { build() {
......
...@@ -18,6 +18,7 @@ source="http://downloads.sourceforge.net/project/conky/conky/$pkgver/conky-$pkgv ...@@ -18,6 +18,7 @@ source="http://downloads.sourceforge.net/project/conky/conky/$pkgver/conky-$pkgv
_builddir="$srcdir"/$pkgname-$pkgver _builddir="$srcdir"/$pkgname-$pkgver
prepare() { prepare() {
cd "$_builddir" cd "$_builddir"
update_config_sub || return 1
local i local i
for i in $source; do for i in $source; do
case $i in case $i in
......
...@@ -20,6 +20,7 @@ _builddir="$srcdir/$pkgname-$pkgver" ...@@ -20,6 +20,7 @@ _builddir="$srcdir/$pkgname-$pkgver"
prepare() { prepare() {
cd $_builddir cd $_builddir
update_config_sub || return 1
for i in $source; do for i in $source; do
case $i in case $i in
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
......
...@@ -13,9 +13,16 @@ install= ...@@ -13,9 +13,16 @@ install=
source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
cpufreqd.initd" cpufreqd.initd"
_builddir="$srcdir/$pkgname-$pkgver"
prepare() {
cd "$_builddir"
update_config_sub || return 1
}
build () build ()
{ {
cd "$srcdir"/$pkgname-$pkgver cd "$_builddir"
./configure \ ./configure \
--build=$CBUILD \ --build=$CBUILD \
--host=$CHOST \ --host=$CHOST \
...@@ -26,7 +33,7 @@ build () ...@@ -26,7 +33,7 @@ build ()
} }
package() { package() {
cd "$srcdir"/$pkgname-$pkgver cd "$_builddir"
make DESTDIR="$pkgdir" install || return 1 make DESTDIR="$pkgdir" install || return 1
rm "$pkgdir"/usr/lib/*.la || return 1 rm "$pkgdir"/usr/lib/*.la || return 1
install -Dm 755 ../cpufreqd.initd "$pkgdir"/etc/init.d/cpufreqd \ install -Dm 755 ../cpufreqd.initd "$pkgdir"/etc/init.d/cpufreqd \
......
...@@ -17,6 +17,7 @@ _builddir="$srcdir"/$pkgname-$pkgver ...@@ -17,6 +17,7 @@ _builddir="$srcdir"/$pkgname-$pkgver
prepare() { prepare() {
local i local i
cd "$_builddir" cd "$_builddir"
update_config_sub || return 1
for i in $source; do for i in $source; do
case $i in case $i in
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
......
...@@ -23,6 +23,7 @@ source="http://downloads.sourceforge.net/project/dansguardian/dansguardian-$pkgv ...@@ -23,6 +23,7 @@ source="http://downloads.sourceforge.net/project/dansguardian/dansguardian-$pkgv
_builddir="$srcdir"/dansguardian-$pkgver _builddir="$srcdir"/dansguardian-$pkgver
prepare() { prepare() {
cd "$_builddir" cd "$_builddir"
update_config_sub || return 1
for i in $source; do for i in $source; do
case $i in case $i in
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
......
...@@ -11,6 +11,11 @@ makedepends="" ...@@ -11,6 +11,11 @@ makedepends=""
source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.tar.bz2" source="http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$pkgver.tar.bz2"
_builddir="$srcdir"/$pkgname-$pkgver _builddir="$srcdir"/$pkgname-$pkgver
prepare() {
cd "$_builddir"
update_config_sub || return 1
}
build() { build() {
cd "$_builddir" cd "$_builddir"
./configure \ ./configure \
......
...@@ -19,6 +19,7 @@ _progs="dropbear dbclient dropbearkey dropbearconvert scp" ...@@ -19,6 +19,7 @@ _progs="dropbear dbclient dropbearkey dropbearconvert scp"
prepare() { prepare() {
cd "$_builddir" cd "$_builddir"
update_config_sub || return 1
patch -p1 -i "$srcdir"/dropbear-0.53.1-static_build_fix.patch patch -p1 -i "$srcdir"/dropbear-0.53.1-static_build_fix.patch
} }
......
...@@ -19,6 +19,7 @@ _builddir="$srcdir/${pkgname}${pkgver}" ...@@ -19,6 +19,7 @@ _builddir="$srcdir/${pkgname}${pkgver}"
prepare() { prepare() {
cd "$_builddir" cd "$_builddir"
update_config_sub || return 1
for i in $source; do for i in $source; do
case $i in case $i in
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
......
...@@ -17,6 +17,7 @@ source="http://elinks.or.cz/download/elinks-$_ver.tar.bz2" ...@@ -17,6 +17,7 @@ source="http://elinks.or.cz/download/elinks-$_ver.tar.bz2"
_builddir="$srcdir"/$pkgname-$_ver _builddir="$srcdir"/$pkgname-$_ver
prepare() { prepare() {
cd "$_builddir" cd "$_builddir"
update_config_sub || return 1
} }
build() { build() {
...@@ -35,8 +36,9 @@ build() { ...@@ -35,8 +36,9 @@ build() {
package() { package() {
cd "$_builddir" cd "$_builddir"
make DESTDIR="$pkgdir" install make DESTDIR="$pkgdir" install || return 1
rm -rf "$pkgdir"/usr/lib/charset.alias
rmdir -p "$pkgdir"/usr/lib 2>/dev/null
#fix conflict with gettext #fix conflict with gettext
rm "$pkgdir"/usr/share/locale/locale.alias rm "$pkgdir"/usr/share/locale/locale.alias
} }
......
...@@ -17,6 +17,7 @@ _builddir="$srcdir"/$pkgname-$pkgver ...@@ -17,6 +17,7 @@ _builddir="$srcdir"/$pkgname-$pkgver
prepare() { prepare() {
cd "$_builddir" cd "$_builddir"
update_config_sub || return 1
# apply patches here # apply patches here
} }
......
...@@ -13,6 +13,11 @@ subpackages="$pkgname-dev $pkgname-doc" ...@@ -13,6 +13,11 @@ subpackages="$pkgname-dev $pkgname-doc"
source="http://www.exiv2.org/exiv2-$pkgver.tar.gz" source="http://www.exiv2.org/exiv2-$pkgver.tar.gz"
_builddir="$srcdir"/$pkgname-$pkgver _builddir="$srcdir"/$pkgname-$pkgver
prepare() {
cd "$_builddir"
update_config_sub || return 1
}
build() { build() {
cd "$_builddir" cd "$_builddir"
./configure \ ./configure \
......
...@@ -14,7 +14,8 @@ source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.t ...@@ -14,7 +14,8 @@ source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.t
" "
prepare() { prepare() {
cd "$srcdir/$pkgname-$pkgver" cd "$srcdir/$pkgname-$pkgver"
update_config_sub || return 1
for i in $source; do for i in $source; do
case $i in case $i in
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
......
...@@ -15,6 +15,7 @@ source="http://downloads.sourceforge.net/sourceforge/faac/$pkgname-$pkgver.tar.b ...@@ -15,6 +15,7 @@ source="http://downloads.sourceforge.net/sourceforge/faac/$pkgname-$pkgver.tar.b
_builddir="$srcdir"/$pkgname-$pkgver _builddir="$srcdir"/$pkgname-$pkgver
prepare() { prepare() {
cd "$_builddir" cd "$_builddir"
update_config_sub || return 1
for i in $source; do for i in $source; do
case $i in case $i in
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
......
...@@ -17,6 +17,7 @@ _builddir=$srcdir/$pkgname-$pkgver ...@@ -17,6 +17,7 @@ _builddir=$srcdir/$pkgname-$pkgver
prepare() { prepare() {
local i local i
cd "$_builddir" cd "$_builddir"
update_config_sub || return 1
for i in $source; do for i in $source; do
case $i in case $i in
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
...@@ -41,6 +42,9 @@ build() { ...@@ -41,6 +42,9 @@ build() {
package() { package() {
cd "$_builddir" cd "$_builddir"
make DESTDIR="$pkgdir" install || return 1 make DESTDIR="$pkgdir" install || return 1
rm -rf "$pkgdir"/usr/lib/charset.alias
rmdir -p "$pkgdir"/usr/lib 2>/dev/null
return 0
} }
md5sums="d2d264d343d4d0e1575832cc1023c3bf fastjar-0.98.tar.gz" md5sums="d2d264d343d4d0e1575832cc1023c3bf fastjar-0.98.tar.gz"
...@@ -15,8 +15,15 @@ install="fetchmail.pre-install" ...@@ -15,8 +15,15 @@ install="fetchmail.pre-install"
subpackages="$pkgname-doc fetchmailconf" subpackages="$pkgname-doc fetchmailconf"
source="http://download.berlios.de/fetchmail/$pkgname-$pkgver.tar.bz2 source="http://download.berlios.de/fetchmail/$pkgname-$pkgver.tar.bz2
fetchmail.initd" fetchmail.initd"
_builddir="$srcdir/$pkgname-$pkgver"
prepare() {
cd "$_builddir"
update_config_sub || return 1
}
build() { build() {
cd "$srcdir/$pkgname-$pkgver" cd "$_builddir"
./configure \ ./configure \
--build=$CBUILD \ --build=$CBUILD \
...@@ -32,7 +39,7 @@ build() { ...@@ -32,7 +39,7 @@ build() {
} }
package() { package() {
cd "$srcdir/$pkgname-$pkgver" cd "$_builddir"
make DESTDIR="$pkgdir" install