summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLily Wilson2020-06-01 00:18:21 -0400
committerLily Wilson2020-06-01 00:18:21 -0400
commitb75737833191a100b6b5e93e1bc4a24cbcca9ecc (patch)
tree7f21549c733194a2dbeedc724690588ed9dc89c2
parent6c2122fe050e8812e7e726a636cb812415b15b8f (diff)
downloadaur-b75737833191a100b6b5e93e1bc4a24cbcca9ecc.tar.gz
compile with -fcommon because GCC 10 defaults to -fno-common
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD4
-rw-r--r--fcommon.patch12
3 files changed, 17 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 15be0bfa8b9b..bad92c492723 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -19,12 +19,14 @@ pkgbase = ipxe-netboot
source = codesigning_thomas_archlinux.pem
source = codesigning_pierre_archlinux.pem
source = dst_x1.pem
+ source = fcommon.patch
source = test-netboot
sha256sums = SKIP
sha256sums = 2f018d7a5f76efff4078ab3c9a83ebd8ddb8e1dc1a993f86180850e4788e45db
sha256sums = 3ba0cf390975bb07bf1d3c7ff802d6977bdf901c94883ea2de44c16d444252e5
sha256sums = 64d021f345a0b4633de17ba43d816295076adc8a378eaa54e6796e8c0e95d6d0
sha256sums = 139a5e4a4e0fa505378c72c5f700934ce8333f4e6b1b508886c4b0eb14f4be99
+ sha256sums = c063b56a6b9b5b61595be0f96b3f541e57103a681011327963c2bc10993e0242
sha256sums = c485ec0609580bedceb22b008cc7fcadebd30af94b5c42f7ceecd0c40b9abbbe
pkgname = ipxe-netboot
diff --git a/PKGBUILD b/PKGBUILD
index 2785a5dff13d..386fd4815c23 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,12 +20,14 @@ source=('ipxe::git+https://git.ipxe.org/ipxe.git#branch=master'
codesigning_thomas_archlinux.pem
codesigning_pierre_archlinux.pem
dst_x1.pem
+ fcommon.patch
test-netboot)
sha256sums=('SKIP'
'2f018d7a5f76efff4078ab3c9a83ebd8ddb8e1dc1a993f86180850e4788e45db'
'3ba0cf390975bb07bf1d3c7ff802d6977bdf901c94883ea2de44c16d444252e5'
'64d021f345a0b4633de17ba43d816295076adc8a378eaa54e6796e8c0e95d6d0'
'139a5e4a4e0fa505378c72c5f700934ce8333f4e6b1b508886c4b0eb14f4be99'
+ 'c063b56a6b9b5b61595be0f96b3f541e57103a681011327963c2bc10993e0242'
'c485ec0609580bedceb22b008cc7fcadebd30af94b5c42f7ceecd0c40b9abbbe')
pkgver() {
@@ -35,6 +37,7 @@ pkgver() {
prepare() {
cd "$srcdir/ipxe/src"
+ patch -p2 <"$srcdir/fcommon.patch"
mkdir -p config/local
: > config/local/general.h
echo '#define NET_PROTO_IPV6' >> config/local/general.h
@@ -50,7 +53,6 @@ build() {
export NO_WERROR
make \
- CFLAGS+='-fcommon' \
EMBED="$srcdir/arch.ipxe" \
CERT="$srcdir/codesigning_pierre_archlinux.pem","$srcdir/codesigning_thomas_archlinux.pem","$srcdir/dst_x1.pem" \
TRUST="$srcdir/codesigning_pierre_archlinux.pem","$srcdir/codesigning_thomas_archlinux.pem","$srcdir/dst_x1.pem" \
diff --git a/fcommon.patch b/fcommon.patch
new file mode 100644
index 000000000000..5a489e6cfab4
--- /dev/null
+++ b/fcommon.patch
@@ -0,0 +1,12 @@
+diff -Naur a/src/Makefile b/src/Makefile
+--- a/src/Makefile 2020-06-01 00:00:54.887670051 -0400
++++ b/src/Makefile 2020-06-01 00:01:11.610983027 -0400
+@@ -4,7 +4,7 @@
+ #
+
+ CLEANUP :=
+-CFLAGS :=
++CFLAGS := -fcommon
+ ASFLAGS :=
+ LDFLAGS :=
+ HOST_CFLAGS :=