Upgrade to vte-0.38.2

[hvlinux.git] / stage2 / pkg / zlib

diff --git a/stage2/pkg/zlib b/stage2/pkg/zlib
index 0106d36..55c6955 100644 (file)
--- 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
 }