Changeset 0f48e3a for x/lib/freeglut.xml

Timestamp:

05/19/2020 02:56:11 PM (4 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.1, 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:

65a15acc

Parents:

158da04

Message:

Patch freeglut for GCC 10

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

File:

• x/lib/freeglut.xml (modified) (5 diffs)

x/lib/freeglut.xml

@@ -10 +10 @@
   <!ENTITY freeglut-md5sum        "cd5c670c1086358598a6d4a9d166949d">
   <!ENTITY freeglut-size          "432 KB">
-  <!ENTITY freeglut-buildsize     "4.6 MB">
+  <!ENTITY freeglut-buildsize     "5.0 MB">
   <!ENTITY freeglut-time          "less than 0.1 SBU">
 ]>
@@ -75 +75 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/freeglut-&freeglut-version;-gcc10_fix-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">Freeglut Dependencies</bridgehead>
 
@@ -97 +107 @@
 
     <para>
+      First, fix an issue with multiply defined symbols exposed by GCC-10:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../freeglut-&freeglut-version;-gcc10_fix-1.patch</userinput></screen>
+    <para>
       Install <application>Freeglut</application> by running the
       following commands:
@@ -104 +119 @@
 cd    build &amp;&amp;
 
-CFLAGS="$CFLAGS -fcommon"               \
 cmake -DCMAKE_INSTALL_PREFIX=/usr       \
       -DCMAKE_BUILD_TYPE=Release        \
@@ -128 +142 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-<!-- remove the followind and the corresponding switch in cmake command
-     when upstream fix is applied. -->
-    <para>
-      <parameter>CFLAGS="$CFLAGS -fcommon"</parameter>: Fix building with
-      GCC-10 and later.
-    </para>
 
     <para>