X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage2%2Fpkg%2Fzlib;h=55c6955cce59e4f308ec96fbb961c096ea9a73c5;hb=4e78d26dd7f5e46a21cdc916e031f1b4a68578c0;hp=0106d36c23bb88f1f55c87b6677c1f96345e22f6;hpb=3605ab38ca7604b1fe43c3bce5e4963730a85d39;p=hvlinux.git diff --git a/stage2/pkg/zlib b/stage2/pkg/zlib index 0106d36..55c6955 100644 --- a/stage2/pkg/zlib +++ b/stage2/pkg/zlib @@ -1,17 +1,19 @@ #!/bin/bash -CC="gcc -isystem /usr/include" -CXX="g++ -isystem /usr/include" -LDFLAGS="-Wl,-rpath-link,/lib" +hvconfig_pre() +{ + export CC="gcc -isystem /usr/include" + export CXX="g++ -isystem /usr/include" + export LDFLAGS="-Wl,-rpath-link,/lib" -CONFIGURE_OPTS="\ - --shared \ - ${CONFIGURE_OPTS}" + CONFIGURE_OPTS+=" --shared" +} -hvconfig() +hvconfig_post() { - cd ${LFS_TMP}/${PACKAGE} - ./configure ${CONFIGURE_OPTS} + unset CC + unset CXX + unset LDFLAGS } hvbuild_post() @@ -21,6 +23,6 @@ hvbuild_post() mv -v /usr/lib/libz.so.* /lib ln -svf ../../lib/libz.so.1 /usr/lib/libz.so - # Fix the permissions on the static library: + # Fix the permissions on the static library: chmod 644 /usr/lib/libz.a }