diff options
| -rw-r--r-- | main/abuild/APKBUILD | 5 | ||||
| -rw-r--r-- | main/faac/APKBUILD | 4 | ||||
| -rw-r--r-- | main/gcc/APKBUILD | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index 21adf7b92..7f61d84cf 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -7,6 +7,7 @@ url=http://git.alpinelinux.org/cgit/abuild/ source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$pkgver.tar.bz2 gawk.patch 0001-abuild-automatically-add-libgcc-to-depends-when-libp.patch + gawk.patch " depends="fakeroot file sudo pax-utils openssl apk-tools" makedepends="openssl-dev pkgconfig" @@ -36,5 +37,5 @@ package() { } md5sums="2173f4775cb2672661cfc3de55c8450e abuild-2.5.tar.bz2 -7131a1eb6cbc03a2ec70da91be0d16c4 gawk.patch -ce8a7d262d3a341faed0b67c5c894225 0001-abuild-automatically-add-libgcc-to-depends-when-libp.patch" +ce8a7d262d3a341faed0b67c5c894225 0001-abuild-automatically-add-libgcc-to-depends-when-libp.patch +7131a1eb6cbc03a2ec70da91be0d16c4 gawk.patch" diff --git a/main/faac/APKBUILD b/main/faac/APKBUILD index 2de4bd953..1e196aac4 100644 --- a/main/faac/APKBUILD +++ b/main/faac/APKBUILD @@ -14,7 +14,9 @@ source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.t prepare() { cd "$srcdir/$pkgname-$pkgver" #taken from http://bugs.sourcemage.org/show_bug.cgi?id=15263 - sed -i "s/^\(.*strcasestr\)/\/\/ This is in libc and conflicts: \1 /" common/mp4v2/mpeg4ip.h + [ "$ALPINE_LIBC" = "eglibc" ] && sed -i \ + "s/^\(.*strcasestr\)/\/\/ This is in libc and conflicts: \1 /" \ + common/mp4v2/mpeg4ip.h } build() { diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD index 27b3f7e58..ff1dd75eb 100644 --- a/main/gcc/APKBUILD +++ b/main/gcc/APKBUILD @@ -12,7 +12,6 @@ else _chost="i486-alpine-linux-uclibc" _dynamic_linker="--with-dynamic-linker=ld-uClibc.so.$_uclibc_abiver" _with_arch="i486" - _chost="i486-alpine-linux-uclibc" fi pkgrel=5 |