diff options
| -rw-r--r-- | core/ppl/PKGBUILD | 5 | ||||
| -rw-r--r-- | extra/inkscape/PKGBUILD | 5 | ||||
| -rw-r--r-- | extra/libvorbis/PKGBUILD | 7 | ||||
| -rw-r--r-- | extra/lua/PKGBUILD | 6 | ||||
| -rw-r--r-- | extra/netpbm/PKGBUILD | 3 |
5 files changed, 5 insertions, 21 deletions
diff --git a/core/ppl/PKGBUILD b/core/ppl/PKGBUILD index 57cb47e14..193da1a19 100644 --- a/core/ppl/PKGBUILD +++ b/core/ppl/PKGBUILD @@ -16,11 +16,6 @@ md5sums=('ce014f153a28006009db207ca953a984') build() { cd $srcdir/ppl-$pkgver - # Workaround madd.d making a SIGILL on a NaN. - [ "$CARCH" == "mips64el" ] && { - CFLAGS=${CFLAGS/-march=loongson2f/-march=mips3 -mtune=loongson2f} - CXXFLAGS=${CXXFLAGS/-march=loongson2f/-march=mips3 -mtune=loongson2f} - } ./configure --prefix=/usr --enable-interfaces="c,cxx" make } diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index 745df42ad..04b01addf 100644 --- a/extra/inkscape/PKGBUILD +++ b/extra/inkscape/PKGBUILD @@ -28,11 +28,6 @@ sha1sums=('422a4bacd4dc42adafa203244bc9816783cba4d3' install=install build() { - # Workaround madd.d making a SIGILL on a NaN. - [ "$CARCH" == "mips64el" ] && { - CFLAGS=${CFLAGS/-march=loongson2f/-march=mips3 -mtune=loongson2f} - CXXFLAGS=${CXXFLAGS/-march=loongson2f/-march=mips3 -mtune=loongson2f} - } cd "${srcdir}/${pkgname}-${pkgver}" sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py diff --git a/extra/libvorbis/PKGBUILD b/extra/libvorbis/PKGBUILD index 2c7b35a34..0703016db 100644 --- a/extra/libvorbis/PKGBUILD +++ b/extra/libvorbis/PKGBUILD @@ -18,11 +18,8 @@ md5sums=('c870b9bd5858a0ecb5275c14486d9554') build() { cd ${srcdir}/${pkgname}-${pkgver} #-march=i686 optimizes too much, strip it out - if [ "$CARCH" = "mips64el" ]; then - CFLAGS=${CFLAGS/loongson2f/mips3} ./configure --prefix=/usr --disable-static - else - CFLAGS=${CFLAGS/-march=$CARCH} ./configure --prefix=/usr --disable-static - fi + [ "$CARCH" = "i686" ] && export CFLAGS=${CFLAGS/-march=$CARCH} + ./configure --prefix=/usr --disable-static make } diff --git a/extra/lua/PKGBUILD b/extra/lua/PKGBUILD index 65828bc12..67806966e 100644 --- a/extra/lua/PKGBUILD +++ b/extra/lua/PKGBUILD @@ -24,10 +24,8 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p0 -i "${srcdir}/patch-lua-${_patchver}" -d src patch -p1 -i "${srcdir}/lua-arch.patch" - [ "$CARCH" == "x86_64" ] && patch -p1 -i "${srcdir}/lua-5.1-cflags.diff" - [ "$CARCH" == "x86_64" ] && export CFLAGS="$CFLAGS -fPIC" - [ "$CARCH" == "mips64el" ] && patch -p1 -i "${srcdir}/lua-5.1-cflags.diff" - [ "$CARCH" == "mips64el" ] && export CFLAGS="$CFLAGS -fPIC" + [ "$CARCH" != "i686" ] && patch -p1 -i "${srcdir}/lua-5.1-cflags.diff" + [ "$CARCH" != "i686" ] && export CFLAGS="$CFLAGS -fPIC" make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" LUA_SO=liblua.so \ INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \ linux diff --git a/extra/netpbm/PKGBUILD b/extra/netpbm/PKGBUILD index 604487ce6..949654ffa 100644 --- a/extra/netpbm/PKGBUILD +++ b/extra/netpbm/PKGBUILD @@ -33,8 +33,7 @@ build() { sed -i 's|@python|@python2|' buildtools/manpage.mk cp config.mk.in config.mk - [ "${CARCH}" = 'x86_64' ] && echo 'CFLAGS_SHLIB = -fPIC' >> config.mk - [ "${CARCH}" = 'mips64el' ] && echo 'CFLAGS_SHLIB = -fPIC' >> config.mk + [ "${CARCH}" != 'i686' ] && echo 'CFLAGS_SHLIB = -fPIC' >> config.mk echo "NETPBM_DOCURL = file://${srcdir}/doc" >> config.mk echo 'TIFFLIB = libtiff.so' >> config.mk echo 'JPEGLIB = libjpeg.so' >> config.mk |