diff options
Diffstat (limited to 'source/x')
| -rw-r--r-- | source/x/FTBFSlog | 5 | ||||
| -rwxr-xr-x | source/x/freeglut/freeglut.SlackBuild | 12 | ||||
| -rw-r--r-- | source/x/x11/arch.use.flags | 10 | ||||
| -rw-r--r-- | source/x/x11/configure/pixman | 3 |
4 files changed, 18 insertions, 12 deletions
diff --git a/source/x/FTBFSlog b/source/x/FTBFSlog index 98419e30a..2b8c29ba0 100644 --- a/source/x/FTBFSlog +++ b/source/x/FTBFSlog @@ -1,3 +1,8 @@ +Sat Jan 16 18:43:10 UTC 2021 + freeglut: add -fcommon to CFLAGS. Thanks to nobodino. + x11: add -fcommon to CFLAGS. Thanks to nobodino. + x11/pixman: Don't use icecream. ++--------------------------+ Sat Oct 12 17:04:36 UTC 2019 xorg-server: patched to build with libglvnd >= 1.2.0. Thanks to bartgymnast. +--------------------------+ diff --git a/source/x/freeglut/freeglut.SlackBuild b/source/x/freeglut/freeglut.SlackBuild index 7a4cadc85..52023e245 100755 --- a/source/x/freeglut/freeglut.SlackBuild +++ b/source/x/freeglut/freeglut.SlackBuild @@ -1,9 +1,7 @@ #!/bin/bash -# Slackware build script for freeglut - # Copyright 2012 Robby Workman, Northport, Alabama, USA -# Copyright 2016, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2016, 2018, 2019, 2021 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -55,16 +53,16 @@ TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" + SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fcommon" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" + SLKCFLAGS="-O2 -march=i686 -mtune=i686 -fcommon" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -fPIC -fcommon" LIBDIRSUFFIX="64" else - SLKCFLAGS="-O2" + SLKCFLAGS="-O2 -fcommon" LIBDIRSUFFIX="" fi diff --git a/source/x/x11/arch.use.flags b/source/x/x11/arch.use.flags index eb8fbb71f..0e30c3eeb 100644 --- a/source/x/x11/arch.use.flags +++ b/source/x/x11/arch.use.flags @@ -1,11 +1,11 @@ if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" + SLKCFLAGS="-O2 -march=i486 -mtune=i686 -fcommon" elif [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" + SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fcommon" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" + SLKCFLAGS="-O2 -march=i686 -mtune=i686 -fcommon" elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" + SLKCFLAGS="-O2 -fcommon" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -fPIC -fcommon" fi diff --git a/source/x/x11/configure/pixman b/source/x/x11/configure/pixman index 492cf8ae0..52cb86c34 100644 --- a/source/x/x11/configure/pixman +++ b/source/x/x11/configure/pixman @@ -1,3 +1,6 @@ +# Don't use icecream: +PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g") + if [ "$ARCH" = "x86_64" ]; then do_sse2="--enable-sse2" else |