Browse Source

Propagate CC to subdirectories. Closes: #886160

Christoph Biedl 3 years ago
parent
commit
9da527b331

+ 27 - 0
debian/patches/cherry-pick.1.4.0-20-g4da603d.propagate-cc-to-subdirectories.patch

@@ -0,0 +1,27 @@
+Subject: Propagate CC to subdirectories
+Origin: 1.4.0-20-g4da603d
+Upstream-Author: Helmut Grohne <helmut@subdivi.de>
+Date: Wed Jan 3 06:37:56 2018 +1100
+Bug-Debian: https://bugs.debian.org/886160
+
+    pptpd fails to cross build from source, because it fails to propagate CC
+    to plugins/Makefile. It is correctly detected by configure and correctly
+    forwarded to Makefile.am, but fails being forwarded to plugins/Makefile.
+
+    After making that forwarding explicit, pptpd cross builds successfully.
+
+    Fixes Debian #886160.
+
+    Signed-off-by: James Cameron <quozl@laptop.org>
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -54,7 +54,7 @@
+ subdirs = plugins
+ 
+ all-local:
+-	for d in $(subdirs); do $(MAKE) $(MFLAGS) -C $$d all; done
++	for d in $(subdirs); do $(MAKE) $(MFLAGS) 'CC=$(CC)' -C $$d all; done
+ 
+ install-exec-local:
+ 	for d in $(subdirs); do $(MAKE) $(MFLAGS) -C $$d prefix=$(prefix) DESTDIR=$(DESTDIR) install; done

+ 1 - 0
debian/patches/series

@@ -4,6 +4,7 @@ cherry-pick.1.4.0-11-g4ea2db6.ff.bcrelay-c-replace-sprintf-with-snprintf.patch
 cherry-pick.1.4.0-14-gb84360b.pptpctrl-exit-when-bailing.patch
 cherry-pick.1.4.0-16-g0c0ad67.check-for-remote-ip-duplicates-in-pptpd-conf.patch
 cherry-pick.1.4.0-18-gd7b9552.fix-segfault-in-pptpctrl-argument-parser.patch
+cherry-pick.1.4.0-20-g4da603d.propagate-cc-to-subdirectories.patch
 
 # local modifications
 local.build_hardening-flags.patch