Changeset 5246cff for xsoft

Timestamp:

07/03/2016 04:10:38 AM (8 years ago)

Author:

DJ Lucas <dj@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

008336e

Parents:

6c4bb8f

Message:

Minor cleanups

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@17547 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:

xsoft

Files:

• graphweb/firefox.xml (modified) (1 diff)
• other/thunderbird.xml (modified) (2 diffs)

xsoft/graphweb/firefox.xml

@@ -340 +340 @@
     <title>Command Explanations</title>
 
-     <para>
-      <command>sed ...</command>: These commands correct the source to be
-      compatible with gcc6 by preventing c++ scope errors.
-    </para>
-
     <para>
       <command>CFLAGS= ... CXXFLAGS= ...</command>: These settings work around

xsoft/other/thunderbird.xml

@@ -253 +253 @@
 <screen><userinput>sed -e '/#include/i\
     print OUT "#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS\\n"\;' \
-    -i mozilla/nsprpub/config/make-system-wrappers.pl
+    -i mozilla/nsprpub/config/make-system-wrappers.pl &amp;&amp;
 
 sed -e '/#include/a\
     print OUT "#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS\\n"\;' \
-    -i mozilla/nsprpub/config/make-system-wrappers.pl
-
-export CFLAGS_HOLD=$CFLAGS
-export CXXFLAGS_HOLD=$CXXFLAGS
-export CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
-export CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
+    -i mozilla/nsprpub/config/make-system-wrappers.pl &amp;&amp;
+
+export CFLAGS_HOLD=$CFLAGS &amp;&amp;
+export CXXFLAGS_HOLD=$CXXFLAGS &amp;&amp;
+export CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" &amp;&amp;
+export CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" &amp;&amp;
 
 make -f client.mk</userinput></screen>
@@ -276 +276 @@
 
 <screen role="root"><userinput>make -f client.mk install INSTALL_SDK= &amp;&amp;
-chown -R 0:0 /usr/lib/thunderbird-&thunderbird-version;
-export CFLAGS=$CFLAGS_HOLD
-export CXXFLAGS=$CFLAGS_HOLD
+chown -R 0:0 /usr/lib/thunderbird-&thunderbird-version; &amp;&amp;
+
+export CFLAGS=$CFLAGS_HOLD &amp;&amp;
+export CXXFLAGS=$CFLAGS_HOLD &amp;&amp;
 unset CFLAGS_HOLD CXXFLAGS_HOLD</userinput></screen>