Changeset 6c4bb8f

Timestamp:

07/03/2016 03:29:08 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:

5246cff

Parents:

68f9243

Message:

Added firefox-47.0.1-gcc6-1.patch to fix issues with GCC-6.1.

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

Files:

• general.ent (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• xsoft/graphweb/firefox.xml (modified) (4 diffs)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "02">                   <!-- Always 2 digits -->
+<!ENTITY day          "03">                   <!-- Always 2 digits -->
 <!ENTITY month        "07">                   <!-- Always 2 digits -->
 <!ENTITY year         "2016">
@@ -7 +7 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "July 2nd &year;">
+<!ENTITY releasedate  "July 3rd &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

introduction/welcome/changelog.xml

@@ -45 +45 @@
 -->
     <listitem>
+      <para>July 3rd, 2016</para>
+      <itemizedlist>
+        <listitem>
+          <para>[dj] - Added firefox-47.0.1-gcc6-1.patch. Fixes
+          <ulink url="&blfs-ticket-root;8015">#8015</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>July 2nd, 2016</para>
       <itemizedlist>
         <listitem>
-          <para>[dj] - Update to Firefox-47.0.1. Fixes
-          <ulink url="&blfs-ticket-root;8015">#8015</ulink>.</para>
+          <para>[dj] - Update to Firefox-47.0.1.</para>
         </listitem>
         <listitem>

xsoft/graphweb/firefox.xml

@@ -73 +73 @@
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch if using gcc-6 or later
+          <ulink url="&patch-root;/firefox-&firefox-version;-gcc6-1.patch"/>
+        </para>
+      </listitem>
       <listitem>
         <para>
@@ -277 +283 @@
 
     <para>
+      Fix an issue with GCC-6.0 and higher:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../firefox-&firefox-version;-gcc6-1.patch</userinput></screen>
+
+    <para>
       If you are using gtk+-3.20 or later, apply a patch to restore the
       slider on scrollbars:
@@ -298 +310 @@
     </para></note>
 
-<screen><userinput>sed -e '/#include/i\
-    print OUT "#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS\\n"\;' \
-    -i nsprpub/config/make-system-wrappers.pl
-
-sed -e '/#include/a\
-    print OUT "#undef _GLIBCXX_INCLUDE_NEXT_C_HEADERS\\n"\;' \
-    -i nsprpub/config/make-system-wrappers.pl
-
-CFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
-CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
+<screen><userinput>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>
@@ -323 +329 @@
 
 mkdir -pv    /usr/lib/mozilla/plugins  &amp;&amp;
-ln    -sfv   ../../mozilla/plugins /usr/lib/firefox-&firefox-version;/browser</userinput></screen>
+ln    -sfv   ../../mozilla/plugins /usr/lib/firefox-&firefox-version;/browser &amp;&amp;
+
+export CFLAGS=$CFLAGS_HOLD &amp;&amp;
+export CXXFLAGS=$CXXFLAGS_HOLD &amp;&amp;
+unset CFLAGS_HOLD CXXFLAGS_HOLD</userinput></screen>
 
   </sect2>