jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

attr, acl: fix lib/lib32 mess on i686 (close #1342).

Browse source
This commit is contained in:
Juan RP 2015-04-19 10:37:23 +02:00
parent 9420873c54
commit c8d48b64e1
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
srcpkgs/acl/template
View file

@ -1,7 +1,7 @@
# Template file for 'acl' # Template file for 'acl'
pkgname=acl pkgname=acl
version=2.2.52 version=2.2.52
revision=3 revision=4
bootstrap=yes bootstrap=yes
build_style=gnu-configure build_style=gnu-configure
configure_args="--libdir=/usr/lib --libexecdir=/usr/lib" configure_args="--libdir=/usr/lib --libexecdir=/usr/lib"
@ -17,6 +17,9 @@ if [ -z "$CHROOT_READY" ]; then
CFLAGS+=" -I${XBPS_MASTERDIR}/usr/include" CFLAGS+=" -I${XBPS_MASTERDIR}/usr/include"
LDFLAGS+=" -L${XBPS_MASTERDIR}/usr/lib" LDFLAGS+=" -L${XBPS_MASTERDIR}/usr/lib"
fi fi
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
configure_args="--libdir=/usr/lib32 --libexecdir=/usr/lib32"
fi
do_install() { do_install() {
make DIST_ROOT=${DESTDIR} install install-lib install-dev make DIST_ROOT=${DESTDIR} install install-lib install-dev

6
srcpkgs/attr/template
View file

@ -1,7 +1,7 @@
# Template file for 'attr' # Template file for 'attr'
pkgname=attr pkgname=attr
version=2.4.47 version=2.4.47
revision=4 revision=5
bootstrap=yes bootstrap=yes
build_style=gnu-configure build_style=gnu-configure
configure_args="--libdir=/usr/lib --libexecdir=/usr/lib" configure_args="--libdir=/usr/lib --libexecdir=/usr/lib"
@ -12,6 +12,10 @@ license="LGPL-2.1"
distfiles="${NONGNU_SITE}/attr/attr-${version}.src.tar.gz" distfiles="${NONGNU_SITE}/attr/attr-${version}.src.tar.gz"
checksum=25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859 checksum=25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
configure_args="--libdir=/usr/lib32 --libexecdir=/usr/lib32"
fi
do_install() { do_install() {
make DIST_ROOT=${DESTDIR} install install-lib install-dev make DIST_ROOT=${DESTDIR} install install-lib install-dev
} }