*/*: preemptively disable fstack-clash-protection/fno-plt where failed/-zlazy

35 files changed, 152 insertions, 54 deletions

diff --git a/community/accel-ppp/APKBUILD b/community/accel-ppp/APKBUILD
index e97eb205cab..74ae571cc7d 100644
--- a/community/accel-ppp/APKBUILD
+++ b/community/accel-ppp/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=accel-ppp
 pkgver=1.12.0_git20230404
 _gitrev=8bb85f829aae15e370a3289735bf2428bd4236dd
-pkgrel=0
+pkgrel=1
 pkgdesc="PPtP/L2TP/PPPoE/SSTP server for Linux"
 url="https://accel-ppp.org/"
 arch="all"
@@ -29,6 +29,8 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/accel-ppp/accel-ppp/archive/
 builddir="$srcdir/accel-ppp-$_gitrev"
 
 build() {
+	export CFLAGS="${CFLAGS/-fno-plt}"
+	export CXXFLAGS="${CXXFLAGS/-fno-plt}"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
diff --git a/community/chromium/APKBUILD b/community/chromium/APKBUILD
index a9a988482c4..dfb4308cb29 100644
--- a/community/chromium/APKBUILD
+++ b/community/chromium/APKBUILD
@@ -573,6 +573,8 @@ _configure() {
 
 	# breaks chromium
 	export CXXFLAGS="${CXXFLAGS/-D_GLIBCXX_ASSERTIONS=1}"
+	export CXXFLAGS="${CXXFLAGS/-fstack-clash-protection}"
+	export CFLAGS="${CFLAGS/-fstack-clash-protection}"
 
 	export AR="llvm-ar"
 	export CC="clang"
diff --git a/community/openjdk7/APKBUILD b/community/openjdk7/APKBUILD
index 558b20d753c..072520f3b18 100644
--- a/community/openjdk7/APKBUILD
+++ b/community/openjdk7/APKBUILD
@@ -7,7 +7,7 @@ _icedteaversrc=$_icedteaver
 # pkgver is <JDK version>.<JDK update>
 # check icedtea JDK when updating
 pkgver=7.321.$_icedteaver
-pkgrel=5
+pkgrel=6
 pkgdesc="OpenJDK 7 via IcedTea"
 provider_priority=7
 url="https://icedtea.classpath.org/"
@@ -224,6 +224,13 @@ build() {
 	export PATH=$JAVA_HOME/bin:$srcdir/apache-ant-$_ant_ver/bin:$PATH
 	export DISTRIBUTION_PATCHES=""
 
+	case "$CARCH" in
+	x86)
+		export CFLAGS="${CFLAGS/-fno-plt}"
+		export CXXFLAGS="${CXXFLAGS/-fno-plt}"
+		;;
+	esac
+
 	# Explicitly set the C++ standard as the default has changed on GCC 6+
 	# and disable optimizations that lead to a broken JVM. These options
 	# has been adopted from the Fedora package.
diff --git a/community/openjdk8/APKBUILD b/community/openjdk8/APKBUILD
index 733a295d2a1..50b86ce5621 100644
--- a/community/openjdk8/APKBUILD
+++ b/community/openjdk8/APKBUILD
@@ -6,7 +6,7 @@ _icedteaver=3.27.0
 # pkgver is <JDK version>.<JDK update>.<JDK build>
 # Check https://icedtea.classpath.org/wiki/Main_Page when updating!
 pkgver=8.372.07
-pkgrel=0
+pkgrel=1
 pkgdesc="OpenJDK 8 provided by IcedTea"
 provider_priority=8
 url="https://icedtea.classpath.org/"
@@ -297,6 +297,13 @@ build() {
 	export CFLAGS="$CFLAGS -O3"
 	export CXXFLAGS="$CXXFLAGS -O3"
 
+	case "$CARCH" in
+	x86)
+		export CFLAGS="${CFLAGS/-fno-plt}"
+		export CXXFLAGS="${CXXFLAGS/-fno-plt}"
+		;;
+	esac
+
 	bash ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
diff --git a/community/tigervnc/APKBUILD b/community/tigervnc/APKBUILD
index 4267a26a616..09ec51b4fc4 100644
--- a/community/tigervnc/APKBUILD
+++ b/community/tigervnc/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Patrycja Rosa <alpine@ptrcnull.me>
 pkgname=tigervnc
 pkgver=1.13.1
-pkgrel=2
+pkgrel=3
 _xorg_version=21.1.7
 pkgdesc="High performance, multi-platform VNC client and server"
 url="https://tigervnc.org/"
@@ -94,6 +94,8 @@ build() {
 	local _fontroot="/usr/share/fonts"
 	# from community/xorg-server
 	export CFLAGS="$CFLAGS -D_GNU_SOURCE -D__gid_t=gid_t -D__uid_t=uid_t -Wno-error=array-bounds"
+	export CFLAGS="${CFLAGS/-fno-plt}"
+	export CXXFLAGS="${CXXFLAGS/-fno-plt}"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	./configure --disable-config-hal \
 		--disable-config-udev \
diff --git a/community/xf86-input-evdev/APKBUILD b/community/xf86-input-evdev/APKBUILD
index be6a2c6a9c1..8fe94e0d200 100644
--- a/community/xf86-input-evdev/APKBUILD
+++ b/community/xf86-input-evdev/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-input-evdev
 pkgver=2.10.6
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org evdev input driver"
 url="https://xorg.freedesktop.org"
 arch="all"
@@ -12,6 +12,8 @@ makedepends="libxkbfile-dev xorg-server-dev libxi-dev libxrandr-dev
 source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
 
 build() {
+	export CFLAGS="${CFLAGS/-fno-plt}"
+	export CXXFLAGS="${CXXFLAGS/-fno-plt}"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	./configure \
 		--build=$CBUILD \
@@ -28,4 +30,6 @@ package() {
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
-sha512sums="560b0a6491d50a46913a5890a35c0367e59f550670993493bd9712d712a9747ddaa6fe5086daabf2fcafa24b0159383787eb273da4a2a60c089bfc0a77ad2ad1  xf86-input-evdev-2.10.6.tar.bz2"
+sha512sums="
+560b0a6491d50a46913a5890a35c0367e59f550670993493bd9712d712a9747ddaa6fe5086daabf2fcafa24b0159383787eb273da4a2a60c089bfc0a77ad2ad1  xf86-input-evdev-2.10.6.tar.bz2
+"
diff --git a/community/xf86-input-synaptics/APKBUILD b/community/xf86-input-synaptics/APKBUILD
index 990584bf1a3..e73e7be8b66 100644
--- a/community/xf86-input-synaptics/APKBUILD
+++ b/community/xf86-input-synaptics/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-input-synaptics
 pkgver=1.9.2
-pkgrel=0
+pkgrel=1
 pkgdesc="X.org synaptics input driver"
 url="https://www.x.org"
 arch="all"
@@ -12,6 +12,8 @@ makedepends="libxkbfile-dev xorg-server-dev libxi-dev libxrandr-dev
 source="https://www.x.org/releases/individual/driver/xf86-input-synaptics-$pkgver.tar.gz"
 
 build() {
+	export CFLAGS="${CFLAGS/-fno-plt}"
+	export CXXFLAGS="${CXXFLAGS/-fno-plt}"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	./configure \
 		--build=$CBUILD \
diff --git a/community/xf86-input-vmmouse/APKBUILD b/community/xf86-input-vmmouse/APKBUILD
index 2dfe3664d9f..0db2ef5713f 100644
--- a/community/xf86-input-vmmouse/APKBUILD
+++ b/community/xf86-input-vmmouse/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-input-vmmouse
 pkgver=13.2.0
-pkgrel=0
+pkgrel=1
 pkgdesc="X.org VMware mouse input driver"
 url="https://xorg.freedesktop.org/"
 arch="x86 x86_64"
@@ -11,6 +11,8 @@ makedepends="libxkbfile-dev xorg-server-dev libxi-dev libxrandr-dev eudev-dev"
 source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.xz"
 
 build() {
+	export CFLAGS="${CFLAGS/-fno-plt}"
+	export CXXFLAGS="${CXXFLAGS/-fno-plt}"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	./configure \
 		--build=$CBUILD \
diff --git a/community/xf86-video-amdgpu/APKBUILD b/community/xf86-video-amdgpu/APKBUILD
index 415014297ef..a4c42df442d 100644
--- a/community/xf86-video-amdgpu/APKBUILD
+++ b/community/xf86-video-amdgpu/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Linus Swälas <linus.swalas@borderless.se>
 pkgname=xf86-video-amdgpu
 pkgver=23.0.0
-pkgrel=0
+pkgrel=1
 pkgdesc="AMD Rx/HDxxxx video driver"
 url="https://xorg.freedesktop.org"
 arch="all"
@@ -23,6 +23,8 @@ makedepends="
 source="https://www.x.org/releases/individual/driver/xf86-video-amdgpu-$pkgver.tar.xz"
 
 build() {
+	export CFLAGS="${CFLAGS/-fno-plt}"
+	export CXXFLAGS="${CXXFLAGS/-fno-plt}"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 
 	./configure \
diff --git a/community/xf86-video-apm/APKBUILD b/community/xf86-video-apm/APKBUILD
index 216e060fc42..ca9f3bfc35e 100644
--- a/community/xf86-video-apm/APKBUILD
+++ b/community/xf86-video-apm/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-apm
 pkgver=1.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Alliance ProMotion video driver"
 url="https://xorg.freedesktop.org/"
 arch="all"
@@ -11,6 +11,8 @@ makedepends="xorg-server-dev libxi-dev util-macros xorgproto"
 source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
 
 build() {
+	export CFLAGS="${CFLAGS/-fno-plt}"
+	export CXXFLAGS="${CXXFLAGS/-fno-plt}"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 
 	./configure \
@@ -29,4 +31,6 @@ package() {
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
-sha512sums="1b10a2d1f886c228629487946fda1ff1766fe0c00657ba8cc1b4cf3bcd7cf66716a0875c90e6f7b7178cf3b48a78a4301bfad1714ee37c63aa7ae9c498ab4f8b  xf86-video-apm-1.3.0.tar.bz2"
+sha512sums="
+1b10a2d1f886c228629487946fda1ff1766fe0c00657ba8cc1b4cf3bcd7cf66716a0875c90e6f7b7178cf3b48a78a4301bfad1714ee37c63aa7ae9c498ab4f8b  xf86-video-apm-1.3.0.tar.bz2
+"
diff --git a/community/xf86-video-ark/APKBUILD b/community/xf86-video-ark/APKBUILD
index b6140dfa70b..750032c897d 100644
--- a/community/xf86-video-ark/APKBUILD
+++ b/community/xf86-video-ark/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-ark
 pkgver=0.7.6
-pkgrel=0
+pkgrel=1
 pkgdesc="X.Org driver for ark cards"
 url="https://xorg.freedesktop.org"
 arch="all"
@@ -11,6 +11,8 @@ makedepends="xorg-server-dev libxi-dev util-macros xorgproto"
 source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.xz"
 
 build() {
+	export CFLAGS="${CFLAGS/-fno-plt}"
+	export CXXFLAGS="${CXXFLAGS/-fno-plt}"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	./configure \
 		--build=$CBUILD \
diff --git a/community/xf86-video-ast/APKBUILD b/community/xf86-video-ast/APKBUILD
index 0882e630bf3..582e978c9e0 100644
--- a/community/xf86-video-ast/APKBUILD
+++ b/community/xf86-video-ast/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-ast
 pkgver=1.1.6
-pkgrel=0
+pkgrel=1
 pkgdesc="X.Org driver for ASpeedTech cards"
 url="https://xorg.freedesktop.org"
 arch="all"
@@ -10,6 +10,8 @@ makedepends="xorg-server-dev libxi-dev util-macros xorgproto"
 source="https://www.x.org/releases/individual/driver/xf86-video-ast-$pkgver.tar.xz"
 
 build() {
+	export CFLAGS="${CFLAGS/-fno-plt}"
+	export CXXFLAGS="${CXXFLAGS/-fno-plt}"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	./configure \
 		--build=$CBUILD \
diff --git a/community/xf86-video-ati/APKBUILD b/community/xf86-video-ati/APKBUILD
index 0442c091502..790ca6b360d 100644
--- a/community/xf86-video-ati/APKBUILD
+++ b/community/xf86-video-ati/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-ati
 pkgver=22.0.0
-pkgrel=0
+pkgrel=1
 pkgdesc="ATI video driver"
 url="https://xorg.freedesktop.org/wiki/"
 arch="all"
@@ -25,12 +25,14 @@ options="!check" # No testsuite
 source="https://xorg.freedesktop.org/archive/individual/driver/xf86-video-ati-$pkgver.tar.xz"
 
 build() {
+	export CFLAGS="${CFLAGS/-fno-plt}"
+	export CXXFLAGS="${CXXFLAGS/-fno-plt}"
+	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
-		--enable-glamor \
-		LDFLAGS="$LDFLAGS -Wl,-z,lazy"
+		--enable-glamor
 	make
 }
 
diff --git a/community/xf86-video-chips/APKBUILD b/community/xf86-video-chips/APKBUILD
index 4c55d83b339..37ece957514 100644
--- a/community/xf86-video-chips/APKBUILD
+++ b/community/xf86-video-chips/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-chips
 pkgver=1.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Chips and Technologies video driver"
 url="https://xorg.freedesktop.org"
 arch="all"
@@ -11,6 +11,8 @@ makedepends="xorg-server-dev libxi-dev util-macros xorgproto"
 source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
 
 build() {
+	export CFLAGS="${CFLAGS/-fno-plt}"
+	export CXXFLAGS="${CXXFLAGS/-fno-plt}"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	./configure \
 		--build=$CBUILD \
@@ -28,4 +30,6 @@ package() {
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
-sha512sums="813f1dfda9e4397610418a8ea6b16aef1dd43a0ffb5118e297eb374759f8b9a5e6f03a168956022ea7e9f9f7424e3d86d87bd1d1bdec455fd2a132722853b585  xf86-video-chips-1.4.0.tar.bz2"
+sha512sums="
+813f1dfda9e4397610418a8ea6b16aef1dd43a0ffb5118e297eb374759f8b9a5e6f03a168956022ea7e9f9f7424e3d86d87bd1d1bdec455fd2a132722853b585  xf86-video-chips-1.4.0.tar.bz2
+"
diff --git a/community/xf86-video-dummy/APKBUILD b/community/xf86-video-dummy/APKBUILD
index 40c462cbf59..0ac5f14407d 100644
--- a/community/xf86-video-dummy/APKBUILD
+++ b/community/xf86-video-dummy/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-dummy
 pkgver=0.4.1
-pkgrel=0
+pkgrel=1
 pkgdesc="X.Org driver for dummy cards"
 url="https://xorg.freedesktop.org"
 arch="all"
@@ -10,6 +10,8 @@ makedepends="xorg-server-dev libxi-dev util-macros xorgproto"
 source="https://www.x.org/releases/individual/driver/xf86-video-dummy-$pkgver.tar.xz"
 
 build() {
+	export CFLAGS="${CFLAGS/-fno-plt}"
+	export CXXFLAGS="${CXXFLAGS/-fno-plt}"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	./configure \
 		--build=$CBUILD \
diff --git a/community/xf86-video-fbdev/APKBUILD b/community/xf86-video-fbdev/APKBUILD
index dfafbe09407..ddae8051b16 100644
--- a/community/xf86-video-fbdev/APKBUILD
+++ b/community/xf86-video-fbdev/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-fbdev
 pkgver=0.5.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Video driver for framebuffer device"
 url="https://www.x.org"
 arch="all"
@@ -13,6 +13,8 @@ source="https://www.x.org/releases/individual/driver/xf86-video-fbdev-$pkgver.ta
 	"
 
 build() {
+	export CFLAGS="${CFLAGS/-fno-plt}"
+	export CXXFLAGS="${CXXFLAGS/-fno-plt}"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	./configure \
 		--build=$CBUILD \
@@ -29,5 +31,7 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="c1217b943bbe3301b3c2a8649ed1004c3c67b02607bd56bbc14f6dfa05e7f0184332c81a6a19595514745501ed88526aee932e555779b7c3a8233646b0979448  xf86-video-fbdev-0.5.0.tar.bz2
-19c6680d8e8b0ba3903fb76438b54f294a1715b93d50e1cb2ef95bb04770add5fdad1df4260ab7eb00bb26578baa79b7cfed3f7fa6cba70348611cc3797af3ee  fix-build.patch"
+sha512sums="
+c1217b943bbe3301b3c2a8649ed1004c3c67b02607bd56bbc14f6dfa05e7f0184332c81a6a19595514745501ed88526aee932e555779b7c3a8233646b0979448  xf86-video-fbdev-0.5.0.tar.bz2
+19c6680d8e8b0ba3903fb76438b54f294a1715b93d50e1cb2ef95bb04770add5fdad1df4260ab7eb00bb26578baa79b7cfed3f7fa6cba70348611cc3797af3ee  fix-build.patch
+"
diff --git a/community/xf86-video-i128/APKBUILD b/community/xf86-video-i128/APKBUILD
index c89d0658936..ef5ad7f37c3 100644
--- a/community/xf86-video-i128/APKBUILD
+++ b/community/xf86-video-i128/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-i128
 pkgver=1.4.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Number 9 I128 video driver"
 url="https://xorg.freedesktop.org"
 arch="all"
@@ -11,6 +11,8 @@ makedepends="xorg-server-dev libxi-dev util-macros xorgproto"
 source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.xz"
 
 build() {
+	export CFLAGS="${CFLAGS/-fno-plt}"
+	export CXXFLAGS="${CXXFLAGS/-fno-plt}"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	./configure \
 		--build=$CBUILD \
diff --git a/community/xf86-video-i740/APKBUILD b/community/xf86-video-i740/APKBUILD
index f9525d99841..0abbbaaf86c 100644
--- a/community/xf86-video-i740/APKBUILD
+++ b/community/xf86-video-i740/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-i740
 pkgver=1.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Intel i740 video driver"
 url="https://xorg.freedesktop.org"
 arch="all"
@@ -12,6 +12,8 @@ source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
 	"
 
 build() {
+	export CFLAGS="${CFLAGS/-fno-plt}"
+	export CXXFLAGS="${CXXFLAGS/-fno-plt}"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	./configure \
 		--build=$CBUILD \
@@ -29,4 +31,6 @@ package() {
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
-sha512sums="d34bcd1084de3173b65b9da4afc88435b153979ed4748cfa715d39f28fb238a21bbca7190a9091cdd9c67f55f98e4ae57980ef4dd7ca3dcfda373712f6bd0568  xf86-video-i740-1.4.0.tar.bz2"
+sha512sums="
+d34bcd1084de3173b65b9da4afc88435b153979ed4748cfa715d39f28fb238a21bbca7190a9091cdd9c67f55f98e4ae57980ef4dd7ca3dcfda373712f6bd0568  xf86-video-i740-1.4.0.tar.bz2
+"
diff --git a/community/xf86-video-intel/APKBUILD b/community/xf86-video-intel/APKBUILD
index e8a9dd4dc82..aaff4dc587e 100644
--- a/community/xf86-video-intel/APKBUILD
+++ b/community/xf86-video-intel/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=xf86-video-intel
 pkgver=2.99.917_git20221028
 _gitrev=b74b67f0f321875492968f7097b9d6e82a66d7df
-pkgrel=4
+pkgrel=5
 pkgdesc="X.Org driver for Intel cards"
 url="https://xorg.freedesktop.org"
 arch="x86 x86_64"
@@ -41,6 +41,8 @@ prepare() {
 }
 
 build() {
+	export CFLAGS="${CFLAGS/-fno-plt}"
+	export CXXFLAGS="${CXXFLAGS/-fno-plt}"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	./configure \
 		--build=$CBUILD \
diff --git a/community/xf86-video-nouveau/APKBUILD b/community/xf86-video-nouveau/APKBUILD
index 97aebfc158b..e5275948072 100644
--- a/community/xf86-video-nouveau/APKBUILD
+++ b/community/xf86-video-nouveau/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-nouveau
 pkgver=1.0.17
-pkgrel=2
+pkgrel=3
 pkgdesc="Open-source X.org drivers for nVidia video cards"
 url="https://nouveau.freedesktop.org/"
 arch="all"
@@ -15,6 +15,8 @@ source="https://www.x.org/archive/individual/driver/xf86-video-nouveau-$pkgver.t
 	"
 
 build() {
+	export CFLAGS="${CFLAGS/-fno-plt}"
+	export CXXFLAGS="${CXXFLAGS/-fno-plt}"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	./configure \
 		--build=$CBUILD \
diff --git a/community/xf86-video-nv/APKBUILD b/community/xf86-video-nv/APKBUILD
index 387a8322f23..409f6a7bf13 100644
--- a/community/xf86-video-nv/APKBUILD
+++ b/community/xf86-video-nv/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-nv
 pkgver=2.1.22
-pkgrel=0
+pkgrel=1
 pkgdesc="Nvidia video driver"
 url="https://xorg.freedesktop.org"
 arch="all"
@@ -13,6 +13,8 @@ source="https://www.x.org/releases/individual/driver/xf86-video-nv-$pkgver.tar.x
 	"
 
 build() {
+	export CFLAGS="${CFLAGS/-fno-plt}"
+	export CXXFLAGS="${CXXFLAGS/-fno-plt}"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	./configure \
 		--build=$CBUILD \
diff --git a/community/xf86-video-openchrome/APKBUILD b/community/xf86-video-openchrome/APKBUILD
index 30622dcbd6c..e0f1d8bc1e5 100644
--- a/community/xf86-video-openchrome/APKBUILD
+++ b/community/xf86-video-openchrome/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-openchrome
 pkgver=0.6.0
-pkgrel=5
+pkgrel=6
 pkgdesc="X.Org driver for VIA/S3G cards"
 url="https://xorg.freedesktop.org"
 arch="all"
@@ -20,6 +20,8 @@ prepare() {
 }
 
 build() {
+	export CFLAGS="${CFLAGS/-fno-plt}"
+	export CXXFLAGS="${CXXFLAGS/-fno-plt}"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	./configure \
 		--build=$CBUILD \
@@ -39,6 +41,8 @@ package() {
 		"$pkgdir"/usr/share/hwdata/videoaliases/openchrome.xinf
 }
 
-sha512sums="f074e70d54c87a9d6e1b52c2c2d72d7c551dcb59a5f34c0a5f9495db1a6e45db4300d51fabf7eedfbe91f964f9422931c752a49b322715c6aa9ddb0db9dd6004  xf86-video-openchrome-0.6.0.tar.bz2
+sha512sums="
+f074e70d54c87a9d6e1b52c2c2d72d7c551dcb59a5f34c0a5f9495db1a6e45db4300d51fabf7eedfbe91f964f9422931c752a49b322715c6aa9ddb0db9dd6004  xf86-video-openchrome-0.6.0.tar.bz2
 b900999fc678f0efdcb526d2f0e0f141ed8ca9403bd2b9895c96be2f5efc424feb50f1828c54cdaf0d7d9b9e723e834068ce36841fac97a2e5209873e8e711c3  openchrome.xinf
-5f585f5fddf3a66d67c805f7187002f14dc3f1b0bc12446921c1064090ae32102ba4227fd2d15d52ae755c5ccc718f315ccbf2c277e7639cfef70297cc56b41a  gcc-10.patch"
+5f585f5fddf3a66d67c805f7187002f14dc3f1b0bc12446921c1064090ae32102ba4227fd2d15d52ae755c5ccc718f315ccbf2c277e7639cfef70297cc56b41a  gcc-10.patch
+"
diff --git a/community/xf86-video-qxl/APKBUILD b/community/xf86-video-qxl/APKBUILD
index 3aecb9443c0..6358ef45125 100644
--- a/community/xf86-video-qxl/APKBUILD
+++ b/community/xf86-video-qxl/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-qxl
 pkgver=0.1.6
-pkgrel=0
+pkgrel=1
 pkgdesc="Xorg X11 qxl video driver"
 options="!check" # No testsuite
 url="https://www.x.org"
@@ -14,6 +14,8 @@ source="https://www.x.org/releases/individual/driver/xf86-video-qxl-$pkgver.tar.
 subpackages="$pkgname-doc xspice"
 
 build() {
+	export CFLAGS="${CFLAGS/-fno-plt}"
+	export CXXFLAGS="${CXXFLAGS/-fno-plt}"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	./configure \
 		--build=$CBUILD \
diff --git a/community/xf86-video-r128/APKBUILD b/community/xf86-video-r128/APKBUILD
index bc526c38697..e55eaa79a31 100644
--- a/community/xf86-video-r128/APKBUILD
+++ b/community/xf86-video-r128/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-r128
 pkgver=6.12.1
-pkgrel=0
+pkgrel=1
 pkgdesc="ATI Rage128 video driver"
 url="https://xorg.freedesktop.org"
 arch="all"
@@ -19,6 +19,8 @@ makedepends="
 source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.xz"
 
 build() {
+	export CFLAGS="${CFLAGS/-fno-plt}"
+	export CXXFLAGS="${CXXFLAGS/-fno-plt}"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	./configure \
 		--build=$CBUILD \
diff --git a/community/xf86-video-rendition/APKBUILD b/community/xf86-video-rendition/APKBUILD
index fc562e69fc8..5eb05914060 100644
--- a/community/xf86-video-rendition/APKBUILD
+++ b/community/xf86-video-rendition/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-rendition
 pkgver=4.2.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Rendition video driver"
 url="https://xorg.freedesktop.org/"
 arch="all"
@@ -12,6 +12,8 @@ makedepends="xorg-server-dev libxi-dev util-macros xorgproto"
 source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
 
 build() {
+	export CFLAGS="${CFLAGS/-fno-plt}"
+	export CXXFLAGS="${CXXFLAGS/-fno-plt}"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	./configure \
 		--build=$CBUILD \
@@ -32,4 +34,6 @@ package() {
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
-sha512sums="5a23a599488946499e9bb3dfaf553cd68b6a1555a9c46b4038f355038a28747715bb940c52170f909917386911c8ae2607c669ba28f24a6c10ad375dab4535aa  xf86-video-rendition-4.2.7.tar.bz2"
+sha512sums="
+5a23a599488946499e9bb3dfaf553cd68b6a1555a9c46b4038f355038a28747715bb940c52170f909917386911c8ae2607c669ba28f24a6c10ad375dab4535aa  xf86-video-rendition-4.2.7.tar.bz2
+"
diff --git a/community/xf86-video-s3virge/APKBUILD b/community/xf86-video-s3virge/APKBUILD
index b294dc865e4..a24e1ea2c87 100644
--- a/community/xf86-video-s3virge/APKBUILD
+++ b/community/xf86-video-s3virge/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-s3virge
 pkgver=1.11.1
-pkgrel=0
+pkgrel=1
 pkgdesc="S3 ViRGE video driver"
 url="https://xorg.freedesktop.org/"
 arch="all"
@@ -11,6 +11,8 @@ makedepends="xorg-server-dev libxi-dev util-macros xorgproto"
 source="https://www.x.org/releases/individual/driver/xf86-video-s3virge-$pkgver.tar.xz"
 
 build() {
+	export CFLAGS="${CFLAGS/-fno-plt}"
+	export CXXFLAGS="${CXXFLAGS/-fno-plt}"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	./configure \
 		--build=$CBUILD \
diff --git a/community/xf86-video-savage/APKBUILD b/community/xf86-video-savage/APKBUILD
index 5bdacac1911..87ef1d630a9 100644
--- a/community/xf86-video-savage/APKBUILD
+++ b/community/xf86-video-savage/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-savage
 pkgver=2.4.0
-pkgrel=0
+pkgrel=1
 pkgdesc="S3 Savage video driver"
 url="https://xorg.freedesktop.org"
 arch="all"
@@ -19,6 +19,8 @@ makedepends="
 source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.xz"
 
 build() {
+	export CFLAGS="${CFLAGS/-fno-plt}"
+	export CXXFLAGS="${CXXFLAGS/-fno-plt}"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	./configure \
 		--build=$CBUILD \
diff --git a/community/xf86-video-siliconmotion/APKBUILD b/community/xf86-video-siliconmotion/APKBUILD
index 4ef1d58922a..193e0905567 100644
--- a/community/xf86-video-siliconmotion/APKBUILD
+++ b/community/xf86-video-siliconmotion/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-siliconmotion
 pkgver=1.7.9
-pkgrel=4
+pkgrel=5
 pkgdesc="Silicon Motion video driver"
 url="https://xorg.freedesktop.org"
 arch="x86_64 x86"
@@ -12,6 +12,8 @@ source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
 	"
 
 build() {
+	export CFLAGS="${CFLAGS/-fno-plt}"
+	export CXXFLAGS="${CXXFLAGS/-fno-plt}"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	./configure \
 		--build=$CBUILD \
@@ -28,4 +30,7 @@ package() {
 	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-sha512sums="13085945ca496f83521c28b25c394077e010031dbdc2374347a932a52650ada02f525269a81d0b0bb20b48e371d5435a7a73cb7555a07dc5a784e77152608c63  xf86-video-siliconmotion-1.7.9.tar.bz2"
+
+sha512sums="
+13085945ca496f83521c28b25c394077e010031dbdc2374347a932a52650ada02f525269a81d0b0bb20b48e371d5435a7a73cb7555a07dc5a784e77152608c63  xf86-video-siliconmotion-1.7.9.tar.bz2
+"
diff --git a/community/xf86-video-sis/APKBUILD b/community/xf86-video-sis/APKBUILD
index f8e3af92570..9d108e2d7cb 100644
--- a/community/xf86-video-sis/APKBUILD
+++ b/community/xf86-video-sis/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-sis
 pkgver=0.12.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org SiS video driver"
 url="https://xorg.freedesktop.org"
 arch="all"
@@ -13,6 +13,8 @@ source="https://www.x.org/releases/individual/driver/xf86-video-sis-$pkgver.tar.
 	"
 
 build() {
+	export CFLAGS="${CFLAGS/-fno-plt}"
+	export CXXFLAGS="${CXXFLAGS/-fno-plt}"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 
 	./configure \
@@ -30,5 +32,7 @@ package() {
 	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-sha512sums="5aa101e5217f15667f2c94f7a76f4afcf47717b61f5d206ce65efe35dc3f674ca294f98ca8586971c6467f31decdd94d8255ebfc7dc220fac0179afc61995952  xf86-video-sis-0.12.0.tar.bz2
-d4262ac8c17d04547473df260518247afb09a5bf6ddbe85d7877534f1e99d316d52fb933839f56a4e61b3706b124fa91c6926d432ba542e525f2007af253ff2a  fix-old-cpp-macros.patch"
+sha512sums="
+5aa101e5217f15667f2c94f7a76f4afcf47717b61f5d206ce65efe35dc3f674ca294f98ca8586971c6467f31decdd94d8255ebfc7dc220fac0179afc61995952  xf86-video-sis-0.12.0.tar.bz2
+d4262ac8c17d04547473df260518247afb09a5bf6ddbe85d7877534f1e99d316d52fb933839f56a4e61b3706b124fa91c6926d432ba542e525f2007af253ff2a  fix-old-cpp-macros.patch
+"
diff --git a/community/xf86-video-tdfx/APKBUILD b/community/xf86-video-tdfx/APKBUILD
index 9f901e0971f..bb00a036a39 100644
--- a/community/xf86-video-tdfx/APKBUILD
+++ b/community/xf86-video-tdfx/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-tdfx
 pkgver=1.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc="3Dfx video driver"
 url="https://xorg.freedesktop.org"
 arch="all"
@@ -13,6 +13,8 @@ source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
 	"
 
 build() {
+	export CFLAGS="${CFLAGS/-fno-plt}"
+	export CXXFLAGS="${CXXFLAGS/-fno-plt}"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	./configure \
 		--build=$CBUILD \
@@ -30,4 +32,6 @@ package() {
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
-sha512sums="eca3359c7db56183a1cfcce7295e41ccc349005ee1cbcf75209f1e4e8e04e887ba511712ef35efc11c940713c8327b0b8ab8b6c86facf02062b3e84c0b1af5ff  xf86-video-tdfx-1.5.0.tar.bz2"
+sha512sums="
+eca3359c7db56183a1cfcce7295e41ccc349005ee1cbcf75209f1e4e8e04e887ba511712ef35efc11c940713c8327b0b8ab8b6c86facf02062b3e84c0b1af5ff  xf86-video-tdfx-1.5.0.tar.bz2
+"
diff --git a/community/xf86-video-vesa/APKBUILD b/community/xf86-video-vesa/APKBUILD
index 258e2ed1224..98ba56ce268 100644
--- a/community/xf86-video-vesa/APKBUILD
+++ b/community/xf86-video-vesa/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-vesa
 pkgver=2.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org generic VESA video driver"
 url="https://xorg.freedesktop.org/wiki/"
 arch="all"
@@ -11,6 +11,8 @@ makedepends="xorg-server-dev libxi-dev util-macros xorgproto"
 source="https://www.x.org/releases/individual/driver/xf86-video-vesa-$pkgver.tar.xz"
 
 build() {
+	export CFLAGS="${CFLAGS/-fno-plt}"
+	export CXXFLAGS="${CXXFLAGS/-fno-plt}"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	./configure \
 		--build=$CBUILD \
diff --git a/community/xf86-video-vmware/APKBUILD b/community/xf86-video-vmware/APKBUILD
index d0d54bcfb3c..01fc0f8341c 100644
--- a/community/xf86-video-vmware/APKBUILD
+++ b/community/xf86-video-vmware/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-vmware
 pkgver=13.4.0
-pkgrel=0
+pkgrel=1
 pkgdesc="X.org VMWare video driver"
 url="https://xorg.freedesktop.org"
 arch="x86 x86_64"
@@ -18,6 +18,8 @@ makedepends="
 source="https://www.x.org/releases/individual/driver/xf86-video-vmware-$pkgver.tar.xz"
 
 build() {
+	export CFLAGS="${CFLAGS/-fno-plt}"
+	export CXXFLAGS="${CXXFLAGS/-fno-plt}"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	./configure \
 		--build=$CBUILD \
diff --git a/community/xorg-server/APKBUILD b/community/xorg-server/APKBUILD
index 1dd88a4f44d..a9d97cb0098 100644
--- a/community/xorg-server/APKBUILD
+++ b/community/xorg-server/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xorg-server
 pkgver=21.1.8
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org X servers"
 url="https://www.x.org/wiki"
 arch="all"
@@ -122,6 +122,8 @@ build() {
 	# xorg modules does not work with the -z now and it seems like we
 	# cannot pass over the linker flag to .so files. so we tweak the
 	# gcc specs.
+	export CFLAGS="${CFLAGS/-fno-plt}"
+	export CXXFLAGS="${CXXFLAGS/-fno-plt}"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	_fontroot="/usr/share/fonts"
 
diff --git a/main/valgrind/APKBUILD b/main/valgrind/APKBUILD
index 122017da753..b394ed8d173 100644
--- a/main/valgrind/APKBUILD
+++ b/main/valgrind/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=valgrind
 pkgver=3.21.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A tool to help find memory-management problems in programs"
 url="https://valgrind.org/"
 # armv6/riscv64 not supported upstream
@@ -28,7 +28,7 @@ aarch64|s390x|armv7|x86) options="$options !check"
 esac
 
 build() {
-	export CFLAGS="$CFLAGS -fno-stack-protector -no-pie"
+	export CFLAGS="${CFLAGS/-fno-plt} -fno-stack-protector -no-pie -U_FORTIFY_SOURCE"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
diff --git a/testing/xf86-video-vboxvideo/APKBUILD b/testing/xf86-video-vboxvideo/APKBUILD
index cd9befbaca7..6f05d130e05 100644
--- a/testing/xf86-video-vboxvideo/APKBUILD
+++ b/testing/xf86-video-vboxvideo/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-vboxvideo
 pkgver=1.0.0
-pkgrel=0
+pkgrel=1
 pkgdesc="VirtualBox guest video driver"
 url="https://cgit.freedesktop.org/xorg/driver/xf86-video-vbox/"
 arch="x86 x86_64"
@@ -14,7 +14,8 @@ source="https://www.x.org/releases/individual/driver/$pkgname-$pkgver.tar.gz"
 builddir="$srcdir/"$pkgname-$pkgver
 
 build() {
-	cd "$builddir"
+	export CFLAGS="${CFLAGS/-fno-plt}"
+	export CXXFLAGS="${CXXFLAGS/-fno-plt}"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	./configure \
 		--build=$CBUILD \
@@ -25,14 +26,14 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
-sha512sums="391fc70cb7774e6e4a15f59ae7c92b1ad4dd0cf0854d92d42d990562d35686892646cbf965fd33bc0087e75a23b04162fea67829bad47173401ebac928bdfe47  xf86-video-vboxvideo-1.0.0.tar.gz"
+sha512sums="
+391fc70cb7774e6e4a15f59ae7c92b1ad4dd0cf0854d92d42d990562d35686892646cbf965fd33bc0087e75a23b04162fea67829bad47173401ebac928bdfe47  xf86-video-vboxvideo-1.0.0.tar.gz
+"