fighting w/ 'make bootstrap' on CentOS7 w/ CLFS GIT-20170803 updates, v3
Michael D Labriola [Fri, 11 Jan 2019 22:40:54 +0000 (17:40 -0500)]
- really fixed gettext

README.building
utils/bootstrap-stage1/go

index e092d08..aa39bde 100644 (file)
@@ -99,7 +99,8 @@ make bootstrap
 
 *NOTE*: bootstrap took another __ minutes on my A10-6700 (x86_64 multilib), 53
         on the A10-7850K, 35 on the FX-8350.  (45 mins then out of space, then
-        another 15 until gettext failure...)
+        another 15 until gettext failure, then another 10 until kernel
+        failure...)
 
 *NOTE*: x86_64-64, FX-8350, bare-metal: 28 minutes
         i686, FX-8350, bare-metal: 28 minutes
index 25a6f54..918c1bc 100755 (executable)
@@ -321,23 +321,9 @@ EOF
             #
             #       I do need to disable building the man and texinfo pages,
             #       though...
-            #
-            # FIXME: still needed?
-            #
 
            setup_generic $1 || exit
 
-            # tweak vars to just build gettext-tools
-            source=$source/gettext-tools
-            builddir=$builddir/gettext-tools
-            configure=$source/configure
-            echo source: $source
-            echo builddir: $builddir
-            echo configure: $configure
-
-            mkdir -p $builddir &&
-            pushd $builddir || exit 1
-
            # FIXME: We've got --enable-shared --disable-static in
            #        $OPTS... Does disabling shared now re-enable static?
             #
@@ -346,27 +332,21 @@ EOF
                --disable-shared  || exit 1
 
             # don't build man in gettext-runtime
-            #pushd $builddir/gettext-runtime &&
-            #sed -i 's|\(^SUBDIRS = [[:space:][:alnum:]$(-_]*\) man |\1 |' \
-            #    Makefile &&
-            #popd || exit 1
+            pushd $builddir/gettext-runtime &&
+            sed -i 's|\(^SUBDIRS = [[:space:][:alnum:]$(-_]*\) man |\1 |' \
+                Makefile &&
+            popd || exit 1
 
             # don't build man or info in gettext-tools
-            #pushd $builddir/gettext-tools &&
-            #sed -i 's|\(^SUBDIRS = [[:space:][:alnum:]$(-_]*\) man |\1 |' \
-            #    Makefile &&
-            #sed -i 's|\(^SUBDIRS =\) doc |\1 |' Makefile &&
-            #popd || exit 1
+            pushd $builddir/gettext-tools &&
+            sed -i 's|\(^SUBDIRS = [[:space:][:alnum:]$(-_]*\) man |\1 |' \
+                Makefile &&
+            sed -i 's|\(^SUBDIRS =\) doc |\1 |' Makefile &&
+            popd || exit 1
 
-            # NOTE: Can't build in parallel (as of 0.19.1)
+            # NOTE: Can't build in parallel (as of 0.19.8)
             #
-            #JOBCOUNT=1 compile_generic $1 || exit 1
-
-            make -C gnulib-lib &&
-            make -C intl pluralx.c &&
-            make -C src msgfmt msgmerge xgettext &&
-            cp -v src/{msgfmt,msgmerge,xgettext} $PREFIX_TOOLS/bin &&
-            popd || exit 1
+            JOBCOUNT=1 compile_generic $1 || exit 1
            ;;
 
        texinfo)