Merge branch '3.2' into 3.3

This commit is contained in:
Danny Rawlins 2017-01-02 20:42:52 +11:00
commit d3b991d158
3 changed files with 15 additions and 10 deletions

View File

@ -1,9 +1,9 @@
drwxr-xr-x root/root lib32/ drwxr-xr-x root/root lib32/
lrwxrwxrwx root/root lib32/libz.so.1 -> libz.so.1.2.8 lrwxrwxrwx root/root lib32/libz.so.1 -> libz.so.1.2.9
-rwxr-xr-x root/root lib32/libz.so.1.2.8 -rwxr-xr-x root/root lib32/libz.so.1.2.9
drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/lib32/ drwxr-xr-x root/root usr/lib32/
-rw-r--r-- root/root usr/lib32/libz.a -rw-r--r-- root/root usr/lib32/libz.a
lrwxrwxrwx root/root usr/lib32/libz.so -> ../../lib32/libz.so.1.2.8 lrwxrwxrwx root/root usr/lib32/libz.so -> ../../lib32/libz.so.1.2.9
drwxr-xr-x root/root usr/lib32/pkgconfig/ drwxr-xr-x root/root usr/lib32/pkgconfig/
-rw-r--r-- root/root usr/lib32/pkgconfig/zlib.pc -rw-r--r-- root/root usr/lib32/pkgconfig/zlib.pc

View File

@ -1 +1 @@
44d667c142d7cda120332623eab69f40 zlib-1.2.8.tar.gz e453644539a07783aa525e834491134e zlib-1.2.9.tar.gz

View File

@ -3,18 +3,23 @@
# Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu
name=zlib-32 name=zlib-32
version=1.2.8 version=1.2.9
release=1 release=1
source=(http://www.zlib.net/zlib-$version.tar.gz) source=(http://www.zlib.net/zlib-$version.tar.gz)
build() { build() {
cd zlib-$version cd zlib-$version
./configure --prefix=/usr \
./configure \
--prefix=/usr \
--libdir=/usr/lib32 \ --libdir=/usr/lib32 \
--sharedlibdir=/lib32 --sharedlibdir=/lib32
make make
make DESTDIR=$PKG mandir=/usr/man install make DESTDIR=$PKG install
ln -sf ../../lib32/libz.so.$version $PKG/usr/lib32/libz.so ln -sf ../../lib32/libz.so.$version $PKG/usr/lib32/libz.so
rm $PKG/lib32/libz.so rm $PKG/lib32/libz.so
rm -rf $PKG/usr/{include,man}
rm -r $PKG/usr/{include,share/man,share}
} }