From 5269508b2b11e1499bdbf96bda757b8d0e85c46a Mon Sep 17 00:00:00 2001
From: Bertrand Jacquin <bertrand@jacquin.bzh>
Date: Sat, 3 Sep 2016 01:11:03 +0100
Subject: flx/dfc: Fix building with gcc 5.4.0, drop CFLAGS and LDFLAGS sed

Package-Manager: portage-2.2.28
---
 flx/dfc/Manifest                                   |  4 ++-
 flx/dfc/dfc-9999.ebuild                            |  7 ++---
 .../9999-BUG-MAJOR-Do-not-inline-pferror.patch     | 31 ++++++++++++++++++++++
 .../9999-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch   | 24 +++++++++++++++++
 4 files changed, 60 insertions(+), 6 deletions(-)
 create mode 100644 flx/dfc/files/9999-BUG-MAJOR-Do-not-inline-pferror.patch
 create mode 100644 flx/dfc/files/9999-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch

(limited to 'flx')

diff --git a/flx/dfc/Manifest b/flx/dfc/Manifest
index e7e15a57..5eb34754 100644
--- a/flx/dfc/Manifest
+++ b/flx/dfc/Manifest
@@ -1,3 +1,5 @@
+AUX 9999-BUG-MAJOR-Do-not-inline-pferror.patch 1016 SHA256 03ea66f77f2683e5f5b75d95a19141a6dd155ae2a32e403644ce7bff746b934a WHIRLPOOL 830797d905f8871f225f922eb35905b6fe3b1fb2cf070ff47fa23bb053e235f89137cf37e83d47085d1b2e5b4f5ca6e6f70cbe71295a8f4283035b184f55d099
+AUX 9999-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch 561 SHA256 197ac4e2a43e913cd2746dd80cfdcb0e4db1670962d4c164aa1accfcf96cdb36 WHIRLPOOL f4d12d600172265a369f16920d0e9227b89b2b6ba1d8e6c78bd8c8443e2050ecf15608ffc046c9668c808d39e4ff97859d106470197e670aea96258fa4fb41c0
 AUX 9999-warning-cast.diff 2198 SHA256 91c5fe95e6dbd81c1a098a2e417ad50e9ebc1a6590daa7fde8c10afa6b0ec69b WHIRLPOOL ff101f6c68f7971dbeb98cd45aff92596b19926caa01a33ec33d1b0afbd03977d8cf2943aab0808829dbf6a566f1340a909cef5349949fa4b93a74e0920e2493
-EBUILD dfc-9999.ebuild 616 SHA256 00554eaf085d70abfe2587033ac8dbc219c2ca172d21f6bbd3b58e4c55ce8e6f WHIRLPOOL e90cf5d7b3d55514467127c3705b413a79d4fdcfa34e7b9059bda3a54bb9434d9f26eb9a7c44157ed48886ecfaa05e39bf020640b3327eb6d435680aaf6a30f4
+EBUILD dfc-9999.ebuild 649 SHA256 26df1f45bb22fd3a6898ae3b2e9c53cad6c93264936635a84ddc132a3b65ede7 WHIRLPOOL bb6103ea7de65840a8d56a07a15d042bcc1b7c90b9fc2261dd3ccc2871127d6e473c5d24a46f8e5c481d565927b0a1bfb57d47d9dd9d85fbd9318768921a355e
 MISC metadata.xml 256 SHA256 6ca43960767ca28661abf97c85263db77fe7643902be2ce777c61aa688d8ea2d WHIRLPOOL cef8582829111be09e651eb819e6d1ea59c9c4386b842169ccd46a14c8e3ccb090486fecd61c5fd4aa47998cacc69cdc1fb5ca6bb6325a4da1ebfd0b6eebda7b
diff --git a/flx/dfc/dfc-9999.ebuild b/flx/dfc/dfc-9999.ebuild
index 9fbd5381..92f74510 100644
--- a/flx/dfc/dfc-9999.ebuild
+++ b/flx/dfc/dfc-9999.ebuild
@@ -19,12 +19,9 @@ RDEPEND="${DEPEND}"
 src_prepare () {
 	default
 
+	epatch "${FILESDIR}/${PV}-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch"
 	epatch "${FILESDIR}/${PV}-warning-cast.diff"
-
-	sed -i \
-		-e "/^CFLAGS=/  s:=.*:=${CFLAGS}:" \
-		-e "/^LDFLAGS=/ s:=.*:=${LDFLAGS}:" \
-		Makefile
+	epatch "${FILESDIR}/${PV}-BUG-MAJOR-Do-not-inline-pferror.patch"
 
 	tc-export CC
 }
diff --git a/flx/dfc/files/9999-BUG-MAJOR-Do-not-inline-pferror.patch b/flx/dfc/files/9999-BUG-MAJOR-Do-not-inline-pferror.patch
new file mode 100644
index 00000000..30233d53
--- /dev/null
+++ b/flx/dfc/files/9999-BUG-MAJOR-Do-not-inline-pferror.patch
@@ -0,0 +1,31 @@
+From e9c8d36011b150263578a9ca3aaf955c622ea6df Mon Sep 17 00:00:00 2001
+From: Bertrand Jacquin <bertrand@jacquin.bzh>
+Date: Sat, 3 Sep 2016 01:08:30 +0100
+Subject: [PATCH] BUG/MAJOR: Do not inline pferror
+
+This cause gcc 5.4.0 to fail linking
+
+  dfc.o: In function `main':
+  dfc.c:(.text.startup+0x48f): undefined reference to `pferror'
+  dfc.c:(.text.startup+0x69e): undefined reference to `pferror'
+  dfc.c:(.text.startup+0x750): undefined reference to `pferror'
+  dfc.c:(.text.startup+0x812): undefined reference to `pferror'
+  dfc.c:(.text.startup+0x9c9): undefined reference to `pferror'
+  collect2: error: ld returned 1 exit sta
+---
+ dfc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dfc.c b/dfc.c
+index 91eb5df..aaa3ed1 100644
+--- a/dfc.c
++++ b/dfc.c
+@@ -54,7 +54,7 @@
+ #define REG_LEN(pmatch, idx)        ((pmatch)[idx].rm_eo - (pmatch)[idx].rm_so)
+ 
+ 
+-inline void pferror(char *message, ...) {
++void pferror(char *message, ...) {
+     va_list argp;
+     char    buff[BUFFLEN];
+     
diff --git a/flx/dfc/files/9999-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch b/flx/dfc/files/9999-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch
new file mode 100644
index 00000000..2a610a4c
--- /dev/null
+++ b/flx/dfc/files/9999-MEDIUM-Respect-CFLAGS-and-LDFLAGS.patch
@@ -0,0 +1,24 @@
+From 250e9014aa4165ece9809d2670df42d34424a1b1 Mon Sep 17 00:00:00 2001
+From: Bertrand Jacquin <bertrand@jacquin.bzh>
+Date: Sat, 3 Sep 2016 01:15:36 +0100
+Subject: [PATCH] MEDIUM: Respect CFLAGS and LDFLAGS
+
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 97e29da..15e6991 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,8 +1,8 @@
+ BIN=dfc
+ SRC=dfc.c
+ OBJ=$(SRC:.c=.o)
+-CFLAGS=-g -O2
+-LDFLAGS=-g -O2 -static
++CFLAGS?=-g -O2
++LDFLAGS?=-g -O2 -static
+ 
+ $(BIN): $(OBJ)
+ 	$(CC) -o $(BIN) $(OBJ) $(LDFLAGS)
-- 
cgit v1.2.3