Print this page
Incorrect symlink creation in zlib
| Split |
Close |
| Expand all |
| Collapse all |
--- old/build/zlib/build.sh
+++ new/build/zlib/build.sh
1 1 #!/usr/bin/bash
2 2
3 3 # Load support functions
4 4 . ../../lib/functions.sh
5 5
6 6 PROG=zlib
7 7 VER=1.2.8
8 8 PKG=library/zlib
9 9 SUMMARY="$PROG - A massively spiffy yet delicately unobtrusive compression library"
10 10 DESC="$SUMMARY"
11 11
12 12 DEPENDS_IPS="system/library/gcc-5-runtime"
13 13 BUILD_DEPENDS_IPS="$DEPENDS_IPS developer/sunstudio12.1"
14 14
15 15
16 16 CFLAGS="-DNO_VIZ"
17 17
18 18 CONFIGURE_OPTS_32="--prefix=$PREFIX
19 19 --includedir=$PREFIX/include
20 20 --libdir=$PREFIX/lib"
21 21
22 22 CONFIGURE_OPTS_64="--prefix=$PREFIX
23 23 --includedir=$PREFIX/include
24 24 --libdir=$PREFIX/lib/$ISAPART64"
25 25
26 26 install_license(){
27 27 # This is fun, take from the zlib.h header
28 28 /bin/awk '/Copyright/,/\*\//{if($1 != "*/"){print}}' \
29 29 $TMPDIR/$BUILDDIR/zlib.h > $DESTDIR/license
30 30 }
31 31
32 32 make_prog32() {
33 33 pushd $TMPDIR/$BUILDDIR > /dev/null
34 34 logcmd gmake LDSHARED="gcc -shared -nostdlib" || logerr "gmake failed"
35 35 popd > /dev/null
36 36 }
|
↓ open down ↓ |
36 lines elided |
↑ open up ↑ |
37 37
38 38 make_prog64() {
39 39 pushd $TMPDIR/$BUILDDIR > /dev/null
40 40 logcmd gmake LDSHARED="gcc -shared -nostdlib" || logerr "gmake failed"
41 41 popd > /dev/null
42 42 }
43 43
44 44 # Relocate the libs to /lib, to match upstream
45 45 move_libs() {
46 46 logcmd mkdir -p $DESTDIR/lib/amd64
47 - logcmd ln -s $DESTDIR/lib/64 amd64
47 + logcmd ln -s amd64 $DESTDIR/lib/64
48 48 logcmd mv $DESTDIR/usr/lib/lib* $DESTDIR/lib || \
49 49 logerr "failed to move libs (32-bit)"
50 50 logcmd mv $DESTDIR/usr/lib/amd64/lib* $DESTDIR/lib/amd64 || \
51 51 logerr "failed to move libs (64-bit)"
52 52 pushd $DESTDIR/usr/lib >/dev/null
53 53 logcmd ln -s ../../lib/libz.so.1.2.8 libz.so
54 54 logcmd ln -s ../../lib/libz.so.1.2.8 libz.so.1
55 55 logcmd ln -s ../../lib/libz.so.1.2.8 libz.so.1.2.8
56 56 popd >/dev/null
57 57 pushd $DESTDIR/usr/lib/amd64 >/dev/null
58 58 logcmd ln -s ../../../lib/64/libz.so.1.2.8 libz.so
59 59 logcmd ln -s ../../../lib/64/libz.so.1.2.8 libz.so.1
60 60 logcmd ln -s ../../../lib/64/libz.so.1.2.8 libz.so.1.2.8
61 61 popd>/dev/null
62 62 }
63 63
64 64 init
65 65 download_source $PROG $PROG $VER
66 66 patch_source
67 67 prep_build
68 68 build
69 69 make_lintlibs z /usr/lib /usr/include
70 70 make_isa_stub
71 71 install_license
72 72 move_libs
73 73 make_package
74 74 clean_up
|
↓ open down ↓ |
17 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX