aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-07-01 06:16:49 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-07-01 06:17:53 +0000
commitc92070ca35324cd780e4e9da62c8e25e3817cf60 (patch)
tree2681639f371edbf6dd843770dcc474b1bbcb000d
parentf4d511238f413dd5dad9988afa6b782aa3f55358 (diff)
downloadaports-c92070ca35324cd780e4e9da62c8e25e3817cf60.tar.bz2
aports-c92070ca35324cd780e4e9da62c8e25e3817cf60.tar.xz
main/lame: fix textrels again
Use fix from gentoo
-rw-r--r--main/lame/APKBUILD18
1 files changed, 14 insertions, 4 deletions
diff --git a/main/lame/APKBUILD b/main/lame/APKBUILD
index 5b10b5c5e8..cffb7502ed 100644
--- a/main/lame/APKBUILD
+++ b/main/lame/APKBUILD
@@ -2,7 +2,7 @@
pkgname=lame
pkgver=3.98.4
_ver=398-2
-pkgrel=3
+pkgrel=4
pkgdesc="An MP3 encoder and graphical frame analyzer"
url="http://lame.sourceforge.net/"
arch="all"
@@ -15,7 +15,7 @@ source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-398-2.tar
_builddir="$srcdir"/$pkgname-$_ver
-build() {
+prepare() {
cd "$_builddir"
# link fronted shared
@@ -25,14 +25,17 @@ build() {
mkdir -p libmp3lame/i386/.libs
# fix for pic build with new nasm
- sed -i -e 's/__OUTPUT_FORMAT__,elf/__OUTPUT_FORMAT__,elf32/g' libmp3lame/i386/nasm.h
+ sed -i -e '/define sp/s/+/ + /g' libmp3lame/i386/nasm.h || return 1
# Fix for ffmpeg.
# https://bugs.gentoo.org/show_bug.cgi?id=265830
patch -p1 < ../lame-3.98.2-ffmpeg-0.5.patch || return 1
aclocal && automake || return 1
+}
+build() {
+ cd "$_builddir"
./configure --prefix=/usr \
--enable-nasm \
--disable-mp3x \
@@ -43,9 +46,16 @@ build() {
}
package() {
+ local _textrels=
cd "$_builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install || return 1
rm "$pkgdir"/usr/lib/*.la
+ _textrels=$(scanelf -q -Rt "$pkgdir")
+ if [ -n "$_textrels" ]; then
+ error "Textrels found:"
+ echo "$_textrels"
+ return 1
+ fi
}
md5sums="719dae0ee675d0c16e0e89952930ed35 lame-398-2.tar.gz