Changeset 1849935

Timestamp:

03/27/2013 02:50:42 PM (11 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

2.4, ablfs-more, legacy, new_features, trunk

Children:

c1dd44c

Parents:

8418e9b

Message:

Retry failed commit r3686: LFS/master.sh:

• Ignore error when useradd does not support "-k /dev/null" (happens at

least on Suse)

• strip "-libstdc++" from the script name to allow building gcc-libstdc++

with package gcc

File:

• LFS/master.sh (modified) (2 diffs)

LFS/master.sh

@@ -30 +30 @@
 021-addinguser:  020-creatingtoolsdir
         @\$(call echo_message, Building)
-        @if [ ! -d \$(LUSER_HOME) ]; then \\
+        @-if [ ! -d \$(LUSER_HOME) ]; then \\
                 groupadd \$(LGROUP); \\
                 useradd -s /bin/bash -g \$(LGROUP) -m -k /dev/null \$(LUSER); \\
@@ -103 +103 @@
     # Grab the name of the target (minus the -pass1 or -pass2 in the case of gcc
     # and binutils in chapter 5)
-    name=`echo ${this_script} | sed -e 's@[0-9]\{3\}-@@' -e 's@-pass[0-9]\{1\}@@'`
+    name=`echo ${this_script} | sed -e 's@[0-9]\{3\}-@@' \
+                                    -e 's@-pass[0-9]\{1\}@@' \
+                                    -e 's@-libstdc++@@'`
 
     # Set the dependency for the first target.