glibc32: update to 2.14.

This commit is contained in:
Juan RP 2011-07-11 18:47:06 +02:00
parent d11c1c344d
commit d541caebb4
2 changed files with 26 additions and 26 deletions

View file

@ -10,7 +10,8 @@ Add_dependency run glibc32
do_install() do_install()
{ {
mkdir -p ${DESTDIR}/usr/lib32 vmove usr/include usr
mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr for f in a so o; do
mv ${SRCPKGDESTDIR}/usr/lib32/*.{a,so,o} ${DESTDIR}/usr/lib32 vmove "usr/lib32/*.${f}" usr/lib32
done
} }

View file

@ -1,15 +1,15 @@
# Template file for 'glibc32' # Template file for 'glibc32'
pkgname=glibc32 pkgname=glibc32
version=2.11.2 version=2.14
distfiles=" distfiles="
http://xbps.nopcode.org/repos/stable/i686/glibc-${version}.i686.xbps http://xbps.nopcode.org/repos/current/i686/glibc-${version}_4.i686.xbps
http://xbps.nopcode.org/repos/stable/i686/glibc-devel-${version}.i686.xbps" http://xbps.nopcode.org/repos/current/i686/glibc-devel-${version}_2.i686.xbps"
build_style=custom-install build_style=custom-install
short_desc="The GNU C library (32 bits)" short_desc="The GNU C library (32 bits)"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
checksum=" checksum="
825e2db530d126c5a4a49a9212f83a86283f9a9db457fed86e92300c47d2c8a5 beafe16fd289cc4a7488a0c260e576863f2ed9ef97aaba08128c5a848443fc00
1f15c9d68947a86454b84cb0b2b6594ec2ab9af22330edbd52b7287050adfa81" 1f892393c2b7a8edd4c50073b735db089c52dcb02f8618d642a659ae496c455b"
long_desc=" long_desc="
The GNU C Library is the standard system C library for all GNU systems, The GNU C Library is the standard system C library for all GNU systems,
and is an important part of what makes up a GNU system. It provides the and is an important part of what makes up a GNU system. It provides the
@ -32,35 +32,34 @@ do_install()
{ {
for f in ${distfiles}; do for f in ${distfiles}; do
local srcfile="${XBPS_SRCDISTDIR}/$(basename ${f})" local srcfile="${XBPS_SRCDISTDIR}/$(basename ${f})"
bsdtar xf ${srcfile} -C ${wrksrc} || return 1 bsdtar xf ${srcfile} -C ${wrksrc}
done done
install -D -m644 ${wrksrc}/usr/include/gnu/stubs-32.h \ vinstall usr/include/gnu/stubs-32.h 644 usr/include/gnu
${DESTDIR}/usr/include/gnu/stubs-32.h vinstall usr/include/sys/elf.h 644 usr/include/sys
install -D -m644 ${wrksrc}/usr/include/sys/elf.h \ vinstall usr/include/sys/vm86.h 644 usr/include/sys
${DESTDIR}/usr/include/sys/elf.h
install -D -m644 ${wrksrc}/usr/include/sys/vm86.h \
${DESTDIR}/usr/include/sys/vm86.h
install -d ${DESTDIR}/lib32 ${DESTDIR}/usr/lib32/gconv vmkdir lib
cp -a ${wrksrc}/lib/*.so* ${DESTDIR}/lib32 vmkdir lib32
cp -a ${wrksrc}/usr/lib/gconv/* ${DESTDIR}/usr/lib32/gconv vmkdir usr/lib32/gconv
install -d ${DESTDIR}/lib vcopy "lib/*.so*" lib32
cd ${DESTDIR}/lib && ln -sf ../lib32/ld-linux.so.2 . vcopy "usr/lib/gconv/*" usr/lib32/gconv
install -m644 ${wrksrc}/usr/lib/*.{a,o} ${DESTDIR}/usr/lib32
install -m755 ${wrksrc}/usr/lib/*.so ${DESTDIR}/usr/lib32 ln -sf /lib32/ld-linux.so.2 ${DESTDIR}/lib/ld-linux.so.2
install -m644 usr/lib/*.{a,o} ${DESTDIR}/usr/lib32
install -m755 usr/lib/*.so ${DESTDIR}/usr/lib32
# Add /lib32 and /usr/lib32 into ld.so(8) cache. # Add /lib32 and /usr/lib32 into ld.so(8) cache.
install -d ${DESTDIR}/etc/ld.so.conf.d install -d ${DESTDIR}/etc/ld.so.conf.d
{ echo "/lib32"; echo "/usr/lib32"; } \ { echo "/lib32"; echo "/usr/lib32"; } \
> ${DESTDIR}/etc/ld.so.conf.d/glibc32.conf || return 1 > ${DESTDIR}/etc/ld.so.conf.d/glibc32.conf
chmod 644 ${DESTDIR}/etc/ld.so.conf.d/glibc32.conf \ chmod 644 ${DESTDIR}/etc/ld.so.conf.d/glibc32.conf && ldconfig
&& ldconfig || return 1
# Fix some .so files to find stuff in lib32 dirs. # Fix some .so files to find stuff in lib32 dirs.
for f in libc libpthread; do for f in libc libpthread; do
sed -i -e "s|/lib/|/lib32/|g" \ sed -i -e "s|/lib/|/lib32/|g" \
${DESTDIR}/usr/lib32/${f}.so || return 1 ${DESTDIR}/usr/lib32/${f}.so
done done
} }