Changeset 6c183b5

Timestamp:

05/14/2020 08:54:12 AM (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:

547c0eb

Parents:

0a5eff8d

Message:

Add user CFLAGS to CFLAGS=-fcommon

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

Files:

• general/genutils/sharutils.xml (modified) (1 diff)
• general/prog/openjdk.xml (modified) (1 diff)
• networking/netprogs/ntp.xml (modified) (1 diff)
• postlfs/filesystems/initramfs.xml (modified) (3 diffs)
• postlfs/filesystems/jfs.xml (modified) (1 diff)
• postlfs/shells/tcsh.xml (modified) (1 diff)
• x/lib/freeglut.xml (modified) (2 diffs)

general/genutils/sharutils.xml

@@ -87 +87 @@
 echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h &&
 
-CFLAGS=-fcommon ./configure --prefix=/usr &&
+CFLAGS="$CFLAGS -fcommon" ./configure --prefix=/usr &&
 make</userinput></screen>
 

general/prog/openjdk.xml

@@ -243 +243 @@
     </para>
 
-<screen><userinput>unset JAVA_HOME                             &amp;&amp;
-bash configure --enable-unlimited-crypto    \
-               --with-extra-cflags=-fcommon \
-               --disable-warnings-as-errors \
-               --with-stdc++lib=dynamic     \
-               --with-giflib=system         \
-               --with-jtreg=$PWD/jtreg      \
-               --with-lcms=system           \
-               --with-libjpeg=system        \
-               --with-libpng=system         \
-               --with-zlib=system           \
-               --with-version-build="&openjdk-build;"     \
-               --with-version-pre=""        \
-               --with-version-opt=""        \
+<screen><userinput>unset JAVA_HOME                                       &amp;&amp;
+bash configure --enable-unlimited-crypto              \
+               --with-extra-cflags="$CFLAGS -fcommon" \
+               --disable-warnings-as-errors           \
+               --with-stdc++lib=dynamic               \
+               --with-giflib=system                   \
+               --with-jtreg=$PWD/jtreg                \
+               --with-lcms=system                     \
+               --with-libjpeg=system                  \
+               --with-libpng=system                   \
+               --with-zlib=system                     \
+               --with-version-build="&openjdk-build;"               \
+               --with-version-pre=""                  \
+               --with-version-opt=""                  \
                --with-cacerts-file=/etc/pki/tls/java/cacerts &amp;&amp;
 make images</userinput></screen>

networking/netprogs/ntp.xml

@@ -136 +136 @@
         Its a "hack" for gcc-10
 -->
-<screen><userinput>./configure CFLAGS="-O2 -g -fPIC -fcommon" \
+<screen><userinput>./configure CFLAGS="-O2 -g -fPIC -fcommon $CFLAGS" \
             --prefix=/usr         \
             --bindir=/usr/sbin    \

postlfs/filesystems/initramfs.xml

@@ -76 +76 @@
   local file
 
-  if [ "$2" == "lib" ]; then
-    file=$(PATH=/lib:/usr/lib type -p $1)
+  if [ "$2" = "lib" ]; then
+    file=$(find /lib /usr/lib -maxdepth 1 -name $1 | head -n 1)
   else
-    file=$(type -p $1)
+    file=$(find /bin /usr/bin /sbin /usr/sbin -maxdepth 1 -name $1 | head -n 1)
   fi
 
@@ -177 +177 @@
 if [ -x /sbin/lvm ] ; then sbinfiles="$sbinfiles lvm dmsetup"; fi
 
+# Add mdadm if present
+if [ -x /sbin/mdadm ] ; then sbinfiles="$sbinfiles mdadm"; fi
+
+# Add udevd if present in /sbin (newer versions of udev have it in
+# /lib/udev)
+if [ -x /sbin/udevd ] ; then sbinfiles="$sbinfiles udevd"; fi
+
 for f in $sbinfiles ; do
   ldd /sbin/$f | sed "s/\t//" | cut -d " " -f1 >> $unsorted
@@ -194 +201 @@
   ln -s kmod $WDIR/bin/insmod
 fi
+
+ln -s bash $WDIR/bin/sh
 
 # Add lvm symlinks if appropriate

postlfs/filesystems/jfs.xml

@@ -104 +104 @@
 sed -i "/ioctl.h/a#include <sys/sysmacros.h>" libfs/devices.c   &&
 
-CFLAGS=-fcommon ./configure &&
+CFLAGS="$CFLAGS -fcommon" ./configure &&
 make</userinput></screen>
 

postlfs/shells/tcsh.xml

@@ -100 +100 @@
     </para>
 
-<screen><userinput>CFLAGS=-fcommon ./configure --prefix=/usr --bindir=/bin &amp;&amp;
+<screen><userinput>CFLAGS="$CFLAGS -fcommon" \
+./configure --prefix=/usr --bindir=/bin &amp;&amp;
 
 make &amp;&amp;

x/lib/freeglut.xml

@@ -104 +104 @@
 cd    build &&
 
+CFLAGS="$CFLAGS -fcommon"               \
 cmake -DCMAKE_INSTALL_PREFIX=/usr       \
-      -DCMAKE_C_FLAGS=-fcommon          \<!-- devs:See command expl below -->
       -DCMAKE_BUILD_TYPE=Release        \
       -DFREEGLUT_BUILD_DEMOS=OFF        \
@@ -131 +131 @@
      when upstream fix is applied. -->
     <para>
-      <parameter>-DCMAKE_C_FLAGS=-fcommon</parameter>: Fix building with
+      <parameter>CFLAGS="$CFLAGS -fcommon"</parameter>: Fix building with
       GCC-10 and later.
     </para>