diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2021-01-17 23:48:59 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2021-01-18 08:59:51 +0100 |
commit | 16c4108efdee84a002fc181f54191cc5a98e82fc (patch) | |
tree | f0eb8d3e0657384d5f9c17c66f98d551607e85c4 /source/x | |
parent | cdbbea4bb74a0bfd04f1484609c725d222b40abd (diff) | |
download | current-16c4108efdee84a002fc181f54191cc5a98e82fc.tar.gz |
Sun Jan 17 23:48:59 UTC 202120210117234859
a/kernel-generic-5.10.8-x86_64-1.txz: Upgraded.
a/kernel-huge-5.10.8-x86_64-1.txz: Upgraded.
a/kernel-modules-5.10.8-x86_64-1.txz: Upgraded.
a/mkinitrd-1.4.11-x86_64-17.txz: Rebuilt.
Upgraded to busybox-1.32.1.
ap/sc-im-20200904_bdd936a-x86_64-1.txz: Upgraded.
d/kernel-headers-5.10.8-x86-1.txz: Upgraded.
d/python-setuptools-51.3.1-x86_64-1.txz: Upgraded.
k/kernel-source-5.10.8-noarch-1.txz: Upgraded.
l/libical-3.0.9-x86_64-1.txz: Upgraded.
l/pulseaudio-14.2-x86_64-1.txz: Upgraded.
n/ModemManager-1.14.10-x86_64-1.txz: Upgraded.
n/iptables-1.8.7-x86_64-1.txz: Upgraded.
n/libnftnl-1.1.9-x86_64-1.txz: Upgraded.
xfce/garcon-4.16.1-x86_64-1.txz: Upgraded.
xfce/xfce4-whiskermenu-plugin-2.5.2-x86_64-1.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
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 98419e30..2b8c29ba 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 7a4cadc8..52023e24 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 eb8fbb71..0e30c3ee 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 492cf8ae..52cb86c3 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 |