Changeset 29b0395

Timestamp:

08/14/2019 09:53:33 PM (5 years ago)

Author:

Ken Moffat <ken@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 9.0, 9.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, 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:

b06fb60c

Parents:

eaa42b70

Message:

Comment seds re SIOCGSTAMP now that a fix is in place in LFS (rev 11651).

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

Files:

• x/lib/qt5.xml (modified) (1 diff)
• xsoft/graphweb/firefox.xml (modified) (2 diffs)

x/lib/qt5.xml

@@ -246 +246 @@
 <screen><userinput>patch -Np1 -i ../qt-&qt5-version;-upstream_fixes-1.patch &amp;&amp;</userinput></screen> 
 
-    <para>
+<!--<para>
       Next, fix an issue caused by changes in the Kernel API Headers:
     </para>
 
 <screen><userinput remap="pre">sed -i 's/SIOCGSTAMP/0x8906/' \
-qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.cpp</userinput></screen>
+qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.cpp</userinput></screen>-->
     <para>
       Install <application>Qt5</application> by running the following commands:

xsoft/graphweb/firefox.xml

@@ -366 +366 @@
 <screen role="nodump"><userinput>sed -e 's/checkImpl/checkFFImpl/g' -i js/src/vm/JSContext*.h</userinput></screen>
 
-    <para>
+<!--<para>
       Apply a sed to work around a change in the linux headers, and then
       invoke the Python2 script to compile the package.
     </para>
 
-<screen><userinput>sed -i 's/SIOCGSTAMP/0x8906/' media/webrtc/trunk/webrtc/rtc_base/physicalsocketserver.cc &amp;&amp;
-
-export CC=gcc CXX=g++ &amp;&amp;
+<screen><userinput>sed -i 's/SIOCGSTAMP/0x8906/' media/webrtc/trunk/webrtc/rtc_base/physicalsocketserver.cc &amp;&amp;-->
+
+    <para>
+      Now invoke the Python2 script to compile the package.
+    </para>
+
+<screen><userinput>export CC=gcc CXX=g++ &amp;&amp;
 export MOZBUILD_STATE_PATH=${PWD}/mozbuild &amp;&amp;
 ./mach build</userinput></screen>
@@ -408 +412 @@
     <title>Command Explanations</title>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/SIOCGSTAMP.xml"/>
+<!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/SIOCGSTAMP.xml"/>-->
 
     <para>