From 4c460e431e75c97b753683c8d13f549d326b0c5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Tue, 10 Nov 2020 14:50:51 +0100 Subject: [PATCH] Remove patch setting CC to gcc This is automatically done these days, so no need for us to do it --- ...ys-use-gcc-as-our-compiler-of-choice.patch | 25 ------------------- ...hardcode-LIBDIR-but-set-it-according.patch | 2 +- ...e-compiler-flags-handed-to-us-by-rpm.patch | 2 +- ...-sys-linux-rework-get_first_ethernet.patch | 2 +- ppp.spec | 1 - 5 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 0001-build-sys-use-gcc-as-our-compiler-of-choice.patch diff --git a/0001-build-sys-use-gcc-as-our-compiler-of-choice.patch b/0001-build-sys-use-gcc-as-our-compiler-of-choice.patch deleted file mode 100644 index b8a76ca..0000000 --- a/0001-build-sys-use-gcc-as-our-compiler-of-choice.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 486e36d184cbaee7e34bb582ea6fdf3bfa9ca531 Mon Sep 17 00:00:00 2001 -From: Michal Sekletar -Date: Fri, 4 Apr 2014 11:23:42 +0200 -Subject: [PATCH 01/27] build-sys: use gcc as our compiler of choice - ---- - pppd/Makefile.linux | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux -index a74c914..1d9ea78 100644 ---- a/pppd/Makefile.linux -+++ b/pppd/Makefile.linux -@@ -30,7 +30,7 @@ ifeq (.depend,$(wildcard .depend)) - include .depend - endif - --# CC = gcc -+CC = gcc - # - COPTS = -O2 -pipe -Wall -g - LIBS = --- -1.8.3.1 - diff --git a/ppp-2.4.8-build-sys-don-t-hardcode-LIBDIR-but-set-it-according.patch b/ppp-2.4.8-build-sys-don-t-hardcode-LIBDIR-but-set-it-according.patch index 2d6bdd6..8544d60 100644 --- a/ppp-2.4.8-build-sys-don-t-hardcode-LIBDIR-but-set-it-according.patch +++ b/ppp-2.4.8-build-sys-don-t-hardcode-LIBDIR-but-set-it-according.patch @@ -28,7 +28,7 @@ index 63872eb..8ed56c1 100644 @@ -32,7 +33,7 @@ endif - CC = gcc + # CC = gcc # -COPTS = -Wall $(RPM_OPT_FLAGS) +COPTS = -Wall $(RPM_OPT_FLAGS) -DLIBDIR=\""$(LIBDIR)"\" diff --git a/ppp-2.4.8-build-sys-utilize-compiler-flags-handed-to-us-by-rpm.patch b/ppp-2.4.8-build-sys-utilize-compiler-flags-handed-to-us-by-rpm.patch index dc0c5df..d38b9d8 100644 --- a/ppp-2.4.8-build-sys-utilize-compiler-flags-handed-to-us-by-rpm.patch +++ b/ppp-2.4.8-build-sys-utilize-compiler-flags-handed-to-us-by-rpm.patch @@ -34,7 +34,7 @@ index 5a44d30..63872eb 100644 +++ b/pppd/Makefile.linux @@ -32,8 +32,7 @@ endif - CC = gcc + # CC = gcc # -COPTS = -O2 -pipe -Wall -g -LIBS = diff --git a/ppp-2.4.8-sys-linux-rework-get_first_ethernet.patch b/ppp-2.4.8-sys-linux-rework-get_first_ethernet.patch index 780e068..18bfecf 100644 --- a/ppp-2.4.8-sys-linux-rework-get_first_ethernet.patch +++ b/ppp-2.4.8-sys-linux-rework-get_first_ethernet.patch @@ -33,7 +33,7 @@ index 53df4d2..0e8107f 100644 @@ -32,6 +32,9 @@ include .depend endif - CC = gcc + # CC = gcc + +LIBS = -ludev + diff --git a/ppp.spec b/ppp.spec index 537625c..3c75dec 100644 --- a/ppp.spec +++ b/ppp.spec @@ -22,7 +22,6 @@ Source11: ifdown-ppp Source12: ppp-watch.tar.xz # Fedora-specific -Patch0001: 0001-build-sys-use-gcc-as-our-compiler-of-choice.patch Patch0002: ppp-2.4.8-build-sys-enable-PAM-support.patch Patch0003: ppp-2.4.8-build-sys-utilize-compiler-flags-handed-to-us-by-rpm.patch Patch0004: 0004-doc-add-configuration-samples.patch