901f9bfbed
Tweak 0003-Sanitize-the-installation-process.patch for 2.2.4 Tweak 0004-Remove-PIE-flags-from-the-build.patch for 2.2.4 Remove 0005-Fix-static-linking-with-GnuTLS.patch as it was merged upstream Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
From b341a1e1fce48012fc5bcf39337488fd33210616 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
Date: Sun, 3 Jul 2016 12:20:21 +0200
|
|
Subject: [PATCH] Remove PIE flags from the build
|
|
|
|
Generating a statically linked binary built with PIE requires the
|
|
Scrt1.o file, which isn't part of Buildroot uClibc toolchains. To
|
|
solve this, we simply disable the PIE flags.
|
|
|
|
[olivier tweak patch for 2.2.4]
|
|
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
|
|
---
|
|
Makedefs.in | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/Makedefs.in b/Makedefs.in
|
|
index 3afef0a..299b297 100644
|
|
--- a/Makedefs.in
|
|
+++ b/Makedefs.in
|
|
@@ -148,7 +148,7 @@ IPPFIND_BIN = @IPPFIND_BIN@
|
|
IPPFIND_MAN = @IPPFIND_MAN@
|
|
LDFLAGS = -L../cgi-bin -L../cups -L../filter -L../ppdc \
|
|
-L../scheduler @LDARCHFLAGS@ \
|
|
- @LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
|
|
+ @LDFLAGS@ @RELROFLAGS@ $(OPTIM)
|
|
LINKCUPS = @LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(SSLLIBS) $(LIBZ)
|
|
LINKCUPSIMAGE = @LINKCUPSIMAGE@
|
|
LIBS = $(LINKCUPS) $(COMMONLIBS)
|
|
--
|
|
2.7.4
|
|
|