summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Dewender2015-06-24 18:09:49 +0200
committerJohannes Dewender2015-06-24 18:09:49 +0200
commit27e060e014a05df5eded029db16687ea5c744cd0 (patch)
tree37a9f29c974c371fbdbe91347987c16afc9787bd
parent60401d9a65d41b9b12617c3a9ae18b6c368c387a (diff)
downloadaur-27e060e014a05df5eded029db16687ea5c744cd0.tar.gz
remove 32 bit asm workaround
Just setting the host works fine.
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD15
2 files changed, 4 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0523787313d6..fee5983e5e61 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = lib32-libass
pkgdesc = A portable library for SSA/ASS subtitles rendering (32 bit)
pkgver = 0.12.2
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/libass/libass/
arch = x86_64
license = BSD
diff --git a/PKGBUILD b/PKGBUILD
index 464c80f27b6f..c8a6aec0b45e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
_pkgbase=libass
pkgname=lib32-${_pkgbase}
pkgver=0.12.2
-pkgrel=1
+pkgrel=2
pkgdesc="A portable library for SSA/ASS subtitles rendering (32 bit)"
arch=('x86_64')
url="https://github.com/libass/libass/"
@@ -15,19 +15,10 @@ makedepends=('gcc-multilib' 'yasm')
source=("${url}/releases/download/${pkgver}/${_pkgbase}-${pkgver}.tar.xz")
md5sums=('d4b78e6a0794a9d386ece5cd08eb2d3e')
-prepare() {
- cd "$srcdir/${_pkgbase}-${pkgver}"
- # force yasm to 32 bit
- sed -i -e 's|X64=true|X86=true|g' configure.ac
- sed -i -e 's|BITS=64|BITS=32|g' configure.ac
- sed -i -e 's|-DARCH_X86_64=1|-DARCH_X86_64=0|g' configure.ac
- sed -i -e 's|-m amd64|-m x86|g' configure.ac
-}
-
build() {
export CC='gcc -m32'
cd "$srcdir/${_pkgbase}-${pkgver}"
- ./configure --prefix=/usr --libdir=/usr/lib32 \
+ ./configure --prefix=/usr --libdir=/usr/lib32 --host=i686-linux-gnu \
--enable-enca \
--enable-harfbuzz \
--enable-fontconfig
@@ -39,5 +30,5 @@ package() {
make DESTDIR="${pkgdir}" install
rm -rf "${pkgdir}"/usr/include
install -dm755 "${pkgdir}"/usr/share/licenses
- install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+ ln -s ${_pkgbase} "${pkgdir}"/usr/share/licenses/${pkgname}
}