summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicola Murino2019-12-02 23:21:09 +0100
committerNicola Murino2019-12-02 23:21:09 +0100
commit0fc2a3fd9400392c37b41168db45b886b61eec7e (patch)
tree7cee455512d4c57e7c6d35a12ad1300055a68bbf
parent4e7d0f7f6e53bec36dab8b5859b87a2104eba958 (diff)
downloadaur-0fc2a3fd9400392c37b41168db45b886b61eec7e.tar.gz
use mingw-env
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD21
2 files changed, 14 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6d2c42dfc176..e2f820f98030 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = mingw-w64-giflib
pkgdesc = A library for reading and writing gif images (mingw-w64)
pkgver = 5.2.1
- pkgrel = 3
+ pkgrel = 4
url = http://sourceforge.net/projects/giflib/
arch = any
license = MIT
diff --git a/PKGBUILD b/PKGBUILD
index f2b6ae16e32b..02cf0fac8197 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: drakkan <nicola.murino at gmail dot com>
pkgname=mingw-w64-giflib
pkgver=5.2.1
-pkgrel=3
+pkgrel=4
pkgdesc="A library for reading and writing gif images (mingw-w64)"
arch=(any)
url="http://sourceforge.net/projects/giflib/"
@@ -28,25 +28,30 @@ prepare() {
}
build() {
- export CPPFLAGS="-D_FORTIFY_SOURCE=2"
- export CFLAGS="-pipe -fno-plt -fexceptions --param=ssp-buffer-size=4"
- export CXXFLAGS=${CFLAGS}
- export LDFLAGS="-Wl,-O1,--sort-common,--as-needed -fstack-protector -lssp"
-
for _arch in ${_architectures}; do
+ unset CPPFLAGS
+ unset CFLAGS
+ unset CXXFLAGS
+ unset LDFLAGS
+ source mingw-env ${_arch}
[[ -d "build-${_arch}" ]] && rm -rf "build-${_arch}"
cp -rf "$srcdir/giflib-${pkgver}" "${srcdir}/build-${_arch}"
pushd build-${_arch}
- make CC=${_arch}-gcc CXX=${_arch}-g++ AR=${_arch}-ar
+ make CC=${CC} CXX=${CXX} AR=${AR}
popd
done
}
package() {
for _arch in ${_architectures}; do
+ unset CPPFLAGS
+ unset CFLAGS
+ unset CXXFLAGS
+ unset LDFLAGS
+ source mingw-env ${_arch}
cd "${srcdir}/build-${_arch}"
- make CC=${_arch}-gcc CXX=${_arch}-g++ AR=${_arch}-ar DESTDIR="${pkgdir}" PREFIX="/usr/${_arch}" install INSTALLABLE="gif2rgb.exe gifbuild.exe giffix.exe giftext.exe giftool.exe gifclrmp.exe"
+ make CC=${CC} CXX=${CXX} AR=${AR} DESTDIR="${pkgdir}" PREFIX="/usr/${_arch}" install INSTALLABLE="gif2rgb.exe gifbuild.exe giffix.exe giftext.exe giftool.exe gifclrmp.exe"
${_arch}-strip --strip-unneeded "$pkgdir"/usr/${_arch}/bin/*.dll
${_arch}-strip -g "$pkgdir"/usr/${_arch}/lib/*.a
${_arch}-strip --strip-all "$pkgdir"/usr/${_arch}/bin/*.exe