snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

glibc: use /usr/lib32 and lib32files for 32bit pkgs.

This commit is contained in:
Juan RP 2014-03-09 11:25:36 +01:00
parent 320167e7e1
commit 9d4b73905b
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
srcpkgs/glibc/template
View File

@ -1,7 +1,7 @@
# Template file for 'glibc' # Template file for 'glibc'
pkgname=glibc pkgname=glibc
version=2.19 version=2.19
revision=2 revision=3
bootstrap=yes bootstrap=yes
# Force creation of -dbg pkg, required by valgrind. # Force creation of -dbg pkg, required by valgrind.
force_debug_pkgs=yes force_debug_pkgs=yes
@ -36,7 +36,13 @@ do_configure() {
mkdir build mkdir build
cd build cd build
echo "slibdir=/usr/lib" > configparms if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
_libdir=/usr/lib32
else
_libdir=/usr/lib
fi
echo "slibdir=${_libdir}" > configparms
echo "bindir=/usr/bin" >> configparms echo "bindir=/usr/bin" >> configparms
echo "sbindir=/usr/sbin" >> configparms echo "sbindir=/usr/sbin" >> configparms
echo "rootsbindir=/usr/sbin" >> configparms echo "rootsbindir=/usr/sbin" >> configparms
@ -59,7 +65,7 @@ do_configure() {
SHELL=/bin/bash ../configure ${configure_args} \ SHELL=/bin/bash ../configure ${configure_args} \
--bindir=/usr/bin --sbindir=/usr/sbin \ --bindir=/usr/bin --sbindir=/usr/sbin \
--libdir=/usr/lib --libexecdir=/usr/lib \ --libdir=${_libdir} --libexecdir=${_libdir} \
--enable-add-ons=ports,nptl,libidn --enable-obsolete-rpc \ --enable-add-ons=ports,nptl,libidn --enable-obsolete-rpc \
--enable-multi-arch --enable-bind-now \ --enable-multi-arch --enable-bind-now \
--disable-profile --enable-kernel=2.6.27 \ --disable-profile --enable-kernel=2.6.27 \
@ -73,6 +79,9 @@ do_build() {
} }
do_install() { do_install() {
vmkdir usr/lib
ln -s lib ${DESTDIR}/usr/lib32
# Create DESTDIR/etc/ld.so.conf # Create DESTDIR/etc/ld.so.conf
mkdir -p ${DESTDIR}/etc mkdir -p ${DESTDIR}/etc
echo "include /etc/ld.so.conf.d/*.conf" > ${DESTDIR}/etc/ld.so.conf echo "include /etc/ld.so.conf.d/*.conf" > ${DESTDIR}/etc/ld.so.conf
@ -110,10 +119,13 @@ do_install() {
vinstall ${wrksrc}/posix/gai.conf 644 etc vinstall ${wrksrc}/posix/gai.conf 644 etc
rm -rf ${DESTDIR}/usr/lib32
rm -rf ${DESTDIR}/var/db rm -rf ${DESTDIR}/var/db
} }
glibc-devel_package() { glibc-devel_package() {
lib32depends="glibc>=${version}_${revision}"
lib32files="/usr/include/gnu/stubs-32.h"
depends="kernel-libc-headers glibc>=${version}_${revision}" depends="kernel-libc-headers glibc>=${version}_${revision}"
short_desc+=" - development files" short_desc+=" - development files"
pkg_install() { pkg_install() {