From 37d17dfb9ec722f7060deef25d2d034009e933af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
Date: Wed, 19 Apr 2023 14:57:32 +0200
Subject: [PATCH] community/pcc-libs: upgrade to 20230419

---
 community/pcc-libs/APKBUILD         |  8 ++--
 community/pcc-libs/fix-cflags.patch | 66 +++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 3 deletions(-)
 create mode 100644 community/pcc-libs/fix-cflags.patch

diff --git a/community/pcc-libs/APKBUILD b/community/pcc-libs/APKBUILD
index ccc6b66c132..e8afd4efe61 100644
--- a/community/pcc-libs/APKBUILD
+++ b/community/pcc-libs/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
 pkgname=pcc-libs
-pkgver=20220619
+pkgver=20230419
 pkgrel=0
 pkgdesc="The portable C compiler support libraries."
 url="http://pcc.ludd.ltu.se/"
@@ -9,7 +9,8 @@ arch="x86 x86_64"
 license="BSD"
 subpackages="$pkgname-dev"
 source="ftp://pcc.ludd.ltu.se/pub/pcc-libs/pcc-libs-$pkgver.tgz
-	musl-fixes.patch"
+	musl-fixes.patch
+	fix-cflags.patch"
 
 prepare() {
 	default_prepare
@@ -32,6 +33,7 @@ package() {
 }
 
 sha512sums="
-1e4de973cdf0dfcad2ec43d072de5249c58ef3d3f5d9c3d23373d8f013f6ef6f72f3d27501bfd8514c106fda3ef80659070f79206efbbd2615f89b659c341279  pcc-libs-20220619.tgz
+b193e32d10cb7a7ce33e00c33842a6a3bc35f385422e87e5bd1975324672897ec6d492c496f83a43e980d9e469ca2b6a556826ea1fe965152f394d2a66d0bd89  pcc-libs-20230419.tgz
 fd8c71cd583c6be29553f2b7e6ce66073afd6d0406ae86f6fbb6a36efe8685be4732d2989180a9b31af734cc9a0973c1c731472f02bad076121f6c3c58391fc4  musl-fixes.patch
+2e2daa89350e9160fd7fe7f98189eebedb62be0eef712d9cbb8fdc2d7d2d47eece0d2d9756bca00fb44784c1067616fd114bed70ff6beb297db8da9d35fcb65b  fix-cflags.patch
 "
diff --git a/community/pcc-libs/fix-cflags.patch b/community/pcc-libs/fix-cflags.patch
new file mode 100644
index 00000000000..0a8e8bd959b
--- /dev/null
+++ b/community/pcc-libs/fix-cflags.patch
@@ -0,0 +1,66 @@
+csu/Makefile passes CFLAGS to csu/linux/Makefile via a recursive make
+invocation on the command-line. This causes CFLAGS of csu/linux/Makefile
+to be overwritten by the value supplied on the command-line. This patch
+is a hacky workaround to fix this.
+
+diff -upr pcc-libs-20230419.orig/csu/linux/Makefile pcc-libs-20230419/csu/linux/Makefile
+--- pcc-libs-20230419.orig/csu/linux/Makefile	2023-04-19 18:51:37.262841602 +0200
++++ pcc-libs-20230419/csu/linux/Makefile	2023-04-19 18:52:03.996245974 +0200
+@@ -4,7 +4,7 @@ VERSION ?= 1.1.0
+ PCCLIBDIR ?= /usr/local/lib/pcc/$(TARGET)/$(VERSION)/lib
+ SRCDIR ?= .
+ 
+-CFLAGS = -I$(SRCDIR)/$(MACH) -I$(SRCDIR) -Wall -Wstrict-prototypes -Wmissing-prototypes
++CFLAGS_EXTRA = -I$(SRCDIR)/$(MACH) -I$(SRCDIR) -Wall -Wstrict-prototypes -Wmissing-prototypes
+ 
+ #OBJS = crt0.o crt1.o gcrt1.o crti.o crtn.o crtbegin.o crtend.o \
+ #	crtbeginS.o crtendS.o crtbeginT.o crtendT.o
+@@ -14,37 +14,37 @@ OBJS = crtbegin.o crtend.o crtbeginS.o c
+ all:	$(OBJS)
+ 
+ crt0.o:	$(MACH)/crt0.c
+-	$(CC) -O2 $(CFLAGS) -c -o $@ $<
++	$(CC) -O2 $(CFLAGS) $(CFLAGS_EXTRA) -c -o $@ $<
+ 
+ crt1.o:	$(MACH)/crt0.c
+-	$(CC) -O2 $(CFLAGS) -c -o $@ $<
++	$(CC) -O2 $(CFLAGS) $(CFLAGS_EXTRA) -c -o $@ $<
+ 
+ gcrt1.o: $(MACH)/crt0.c
+-	$(CC) -O2 -DPROFILE $(CFLAGS) -c -o $@ $<
++	$(CC) -O2 -DPROFILE $(CFLAGS) $(CFLAGS_EXTRA) -c -o $@ $<
+ 
+ crti.o: $(MACH)/crti.c
+-	$(CC) -O2 $(CFLAGS) -c -o $@ $<
++	$(CC) -O2 $(CFLAGS) $(CFLAGS_EXTRA) -c -o $@ $<
+ 
+ crtn.o: $(MACH)/crtn.c
+-	$(CC) -O2 $(CFLAGS) -c -o $@ $<
++	$(CC) -O2 $(CFLAGS) $(CFLAGS_EXTRA) -c -o $@ $<
+ 
+ crtbegin.o: crtbegin.c
+-	$(CC) -O2 $(CFLAGS) -c -o $@ $<
++	$(CC) -O2 $(CFLAGS) $(CFLAGS_EXTRA) -c -o $@ $<
+ 
+ crtend.o: crtend.c
+-	$(CC) -O2 $(CFLAGS) -c -o $@ $<
++	$(CC) -O2 $(CFLAGS) $(CFLAGS_EXTRA) -c -o $@ $<
+ 
+ crtbeginS.o: crtbegin.c
+-	$(CC) -O2 $(CFLAGS) -fpic -c -o $@ $<
++	$(CC) -O2 $(CFLAGS) $(CFLAGS_EXTRA) -fpic -c -o $@ $<
+ 
+ crtendS.o: crtend.c
+-	$(CC) -O2 $(CFLAGS) -fpic -c -o $@ $<
++	$(CC) -O2 $(CFLAGS) $(CFLAGS_EXTRA) -fpic -c -o $@ $<
+ 
+ crtbeginT.o: crtbegin.c
+-	$(CC) -O2 $(CFLAGS) -c -o $@ $<
++	$(CC) -O2 $(CFLAGS) $(CFLAGS_EXTRA) -c -o $@ $<
+ 
+ crtendT.o: crtend.c
+-	$(CC) -O2 $(CFLAGS) -c -o $@ $<
++	$(CC) -O2 $(CFLAGS) $(CFLAGS_EXTRA) -c -o $@ $<
+ 
+ install:
+ 	mkdir -p ${DESTDIR}$(PCCLIBDIR)