summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLlewelyn Trahaearn2016-08-20 21:47:52 -0700
committerLlewelyn Trahaearn2016-08-20 21:47:52 -0700
commit702922f490f5880c26eaabad805a8f1851e4b0df (patch)
treecd950fe020ddee27783173b4e52f6ebca5103a3c
parent8c904763bea7e6440be2cd0183f38b72c0bbdffc (diff)
downloadaur-702922f490f5880c26eaabad805a8f1851e4b0df.tar.gz
Pedantic tuning.
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD11
2 files changed, 8 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fe5d8fdebf64..6144164cf4c9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Wed May 25 16:53:16 UTC 2016
+# Sun Aug 21 04:46:23 UTC 2016
pkgbase = lib32-pciutils
pkgdesc = PCI bus configuration space access library (32-bit)
pkgver = 3.5.1
diff --git a/PKGBUILD b/PKGBUILD
index 21d3c9061d5c..092522bc40de 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,19 +18,22 @@ sha512sums=('a324e96556db23011cf86a3ef082851a608c1ef6dd3841cd3231c2e9ef20085cadc
validpgpkeys=('5558F9399CD7836850553C6EC28E7847ED70F82D') # Martin Mares <mj@ucw.cz>
build() {
- export LDFLAGS+=' -m32'
+ # Modify environment to generate 32-bit ELF. Respects flags defined in makepkg.conf
+ export CFLAGS="-m32 ${CFLAGS}"
+ export CXXFLAGS="-m32 ${CXXFLAGS}"
+ export LDFLAGS="-m32 ${LDFLAGS}"
export PKG_CONFIG_LIBDIR='/usr/lib32/pkgconfig'
cd "${pkgname#lib32-}-${pkgver}"
- make CC="gcc -m32" OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man LIBDIR=/usr/lib32 lib/libpci.a
+ make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man LIBDIR=/usr/lib32 lib/libpci.a
cp lib/libpci.a "${srcdir}/"
make clean
- make CC="gcc -m32" OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man LIBDIR=/usr/lib32 all
+ make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man LIBDIR=/usr/lib32 all
}
package() {
cd "${pkgname#lib32-}-${pkgver}"
- make CC="gcc -m32" SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man LIBDIR=/usr/lib32 DESTDIR="${pkgdir}" install install-lib
+ make SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man LIBDIR=/usr/lib32 DESTDIR="${pkgdir}" install install-lib
install -m644 "${srcdir}/libpci.a" "${pkgdir}/usr/lib32/"
rm -rf "${pkgdir}/usr/"{bin,share,include}
}