Completed transition to new ipkg method (ipkg.def), successfully booting after stage 1

[hvlinux.git] / stage1 / pkg / gettext

diff --git a/stage1/pkg/gettext b/stage1/pkg/gettext
index 7bcd57a..afe372d 100644 (file)
--- a/stage1/pkg/gettext
+++ b/stage1/pkg/gettext
@@ -1,10 +1,11 @@
 #!/bin/bash
 
-CONFIGURE_OPTS="\
-    --prefix=/tools \
-    --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} \
-    ${CONFIGURE_OPTS}"
+hvconfig_pre()
+{
+    CONFIGURE_OPTS="\
+        ${CONFIGURE_OPTS} \
+        --disable-shared"
+}
 
 # When cross-compiling the Gettext configure script assumes we don't have a
 # working wcwidth when we do. The following will fix possible compilation
@@ -19,12 +20,7 @@ EOF
 hvconfig()
 {
     cd ${LFS_TMP}/${PACKAGE}/gettext-tools
-
-    echo "Running configure with options:"
-    echo "  <${CONFIGURE_OPTS}>"
-
-    CC="${CC} ${CLFS_BUILDFLAGS}" CXX="${CXX} ${CLFS_BUILDFLAGS}" \
-        ./configure ${CONFIGURE_OPTS}
+    ./configure ${CONFIGURE_OPTS}
 }
 
 hvbuild()