From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 3 Jul 2016 10:21:13 +0000 (+0200)
Subject: cups: reformat patch with Git
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0071464e8b92a270fe9c8031b0ea0e4a7fd9cbee;p=buildroot.git

cups: reformat patch with Git

All patches in the cups package are Git formatted, except
0004-remove-pie.patch, so this commit makes things consistent by also
making this patch Git formatted.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---

diff --git a/package/cups/0004-Remove-PIE-flags-from-the-build.patch b/package/cups/0004-Remove-PIE-flags-from-the-build.patch
new file mode 100644
index 0000000000..492418f70d
--- /dev/null
+++ b/package/cups/0004-Remove-PIE-flags-from-the-build.patch
@@ -0,0 +1,30 @@
+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.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.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
+@@ -142,7 +142,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) $(LIBZ)
+ LINKCUPSIMAGE	=	@LINKCUPSIMAGE@
+ LIBS		=	$(LINKCUPS) $(COMMONLIBS)
+-- 
+2.7.4
+
diff --git a/package/cups/0004-remove-pie.patch b/package/cups/0004-remove-pie.patch
deleted file mode 100644
index 3d81941ef4..0000000000
--- a/package/cups/0004-remove-pie.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/Makedefs.in
-===================================================================
---- a/Makedefs.in
-+++ b/Makedefs.in
-@@ -142,7 +142,7 @@
- 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) $(LIBZ)
- LINKCUPSIMAGE	=	@LINKCUPSIMAGE@
- LIBS		=	$(LINKCUPS) $(COMMONLIBS)