Changeset 9219099f

Timestamp:

05/15/2021 08:11:36 PM (3 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

11.0, 11.1, 11.2, 11.3, 12.0, 12.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:

abed472

Parents:

7cb4635

git-author:

Douglas R. Reno <renodr@…> (05/15/2021 08:10:11 PM)

git-committer:

Douglas R. Reno <renodr@…> (05/15/2021 08:11:36 PM)

Message:

fuse: Fix a build error with GCC-11.1 and stop moving libraries and
programs to /lib and /bin.

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• networking/netutils/traceroute.xml (modified) (1 diff)
• postlfs/filesystems/fuse3.xml (modified) (3 diffs)

introduction/welcome/changelog.xml

@@ -51 +51 @@
         </listitem>
         <listitem>
+          <para>[renodr] - Fix building fuse-3.10.3 with GCC-11.1.0 and also
+          stop moving libraries/binaries to /bin and /lib.</para>
+        </listitem>
+        <listitem>
           <para>[renodr] - Stop moving /usr/bin/traceroute to /bin in the
           installation instructions for traceroute.</para>

networking/netutils/traceroute.xml

@@ -105 +105 @@
 
 <screen role='root'><userinput>make prefix=/usr install                                 &amp;&amp;
-ln -sv -f traceroute /bin/traceroute6                    &amp;&amp;
+ln -sv -f traceroute /usr/bin/traceroute6                &amp;&amp;
 ln -sv -f traceroute.8 /usr/share/man/man8/traceroute6.8 &amp;&amp;
 rm -fv /usr/share/man/man1/traceroute.1</userinput></screen>

postlfs/filesystems/fuse3.xml

@@ -114 +114 @@
 
     <para>
+      First, fix a build issue caused by GCC-11.1:
+    </para>
+
+<screen><userinput remap="pre">sed -i '/iostream/a #include &lt;limits&gt;' example/cxxopts.hpp</userinput></screen>
+
+    <para>
       Install <application>Fuse</application> by running the following
       commands:
@@ -159 +165 @@
 <screen role="root"><userinput>ninja install                                             &amp;&amp;
 
-mv -vf   /usr/lib/libfuse3.so.3*     /lib                 &amp;&amp;
-ln -sfvn ../../lib/libfuse3.so.&fuse3-version; /usr/lib/libfuse3.so &amp;&amp;
-
-mv -vf /usr/bin/fusermount3  /bin         &amp;&amp;
-mv -vf /usr/sbin/mount.fuse3 /sbin        &amp;&amp;
-chmod u+s /bin/fusermount3                &amp;&amp;
+chmod u+s /usr/bin/fusermount3                &amp;&amp;
 
 install -v -m755 -d /usr/share/doc/fuse-&fuse3-version;      &amp;&amp;
@@ -181 +182 @@
     </para>
 
+<!-- FIXME: Removed with merged-/usr changes
     <para>
       <command>mv ... libfuse3.so.3*; ln ... libfuse3.so</command>: 
       These commands install the libraries in the /lib directory.
     </para>
+-->
+
 <!--
     <para>