From: Camm Maguire <camm@debian.org>
Date: Fri, 17 Dec 2021 16:08:45 +0000 (+0000)
Subject: <short summary of the patch>
X-Git-Tag: archive/raspbian/2.6.12-115+rpi1^2~84
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=12f7cd45640987ece90c7e7675977a972dfcc44f;p=gcl.git

<short summary of the patch>

Bug-Debian: https://bugs.debian.org/822820
Bug-Debian: https://bugs.debian.org/837481

TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.

gcl (2.6.12-42) unstable; urgency=medium

  * pathnames1.6
  * Bug fix: "FTBFS with bindnow and PIE enabled", thanks to Balint Reczey
    (Closes: #837481).
  * Bug fix: "FTBFS with compilers that default to -fPIE (patch
    attached)", thanks to Adam Conrad (Closes: #822820).

Gbp-Pq: Name pathnames1.6
---

diff --git a/o/makefile b/o/makefile
index 57db00ea..f032e9cd 100644
--- a/o/makefile
+++ b/o/makefile
@@ -34,7 +34,7 @@ boot.o: boot.c $(DECL) boot.h
 	$(CC) -c $(CFLAGS) $(DEFS) -fPIC $*.c $(AUX_INFO) 
 
 prelink.o: prelink.c $(DECL)
-	$(CC) -fPIE -c $(filter-out -pg,$(CFLAGS)) $(DEFS) $*.c $(AUX_INFO)
+	$(CC) -c $(filter-out -pg,$(CFLAGS)) -fPIE $(DEFS) $*.c $(AUX_INFO)
 
 %.o: %.c $(DECL)
 	$(CC) -c $(CFLAGS) $(DEFS) $*.c $(AUX_INFO)