Author: pierre
Date: Tue May 19 07:56:11 2020
New Revision: 23172
Log:
Patch freeglut for GCC 10
Modified:
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/x/lib/freeglut.xml
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Tue May 19 07:07:40
2020 (r23171)
+++ trunk/BOOK/introduction/welcome/changelog.xml Tue May 19 07:56:11
2020 (r23172)
@@ -45,6 +45,10 @@
<para>May 19th, 2020</para>
<itemizedlist>
<listitem>
+ <para>[pierre] - Add a patch to freeglut to avoid the use of
+ -fcommon.</para>
+ </listitem>
+ <listitem>
<para>[pierre] - Add a patch to lxtask to avoid the use of
-fcommon.</para>
</listitem>
Modified: trunk/BOOK/x/lib/freeglut.xml
==============================================================================
--- trunk/BOOK/x/lib/freeglut.xml Tue May 19 07:07:40 2020 (r23171)
+++ trunk/BOOK/x/lib/freeglut.xml Tue May 19 07:56:11 2020 (r23172)
@@ -9,7 +9,7 @@
<!ENTITY freeglut-download-ftp " ">
<!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">
]>
@@ -74,6 +74,16 @@
</listitem>
</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>
<bridgehead renderas="sect4">Required</bridgehead>
@@ -96,6 +106,11 @@
<title>Installation of Freeglut</title>
<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:
</para>
@@ -103,7 +118,6 @@
<screen><userinput>mkdir build &&
cd build &&
-CFLAGS="$CFLAGS -fcommon" \
cmake -DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
-DFREEGLUT_BUILD_DEMOS=OFF \
@@ -127,12 +141,6 @@
<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>
<parameter>-DFREEGLUT_BUILD_DEMOS=OFF</parameter>: Disable building
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
