From: Juergen Perlinger <perlinger@ntp.org>
Date: Fri, 25 Aug 2017 21:32:40 +0000 (+0000)
Subject: [Bug 3399] NTP: linker error in 4.2.8p10 during Linux cross-compilation
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c1a56063ba5ed72a22caff735f4baa46cdae02b;p=thirdparty%2Fntp.git

[Bug 3399] NTP: linker error in 4.2.8p10 during Linux cross-compilation

bk: 59a09778uHlWcAuFMFoWvJdkeHHM1A
---

diff --git a/ChangeLog b/ChangeLog
index a1a1cfae4..b0e9ec802 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+---
+* [Bug 3399] NTP: linker error in 4.2.8p10 during Linux cross-compilation
+  - initial patch by timeflies@mail2tor.com  <perlinger@ntp.org>
+
 ---
 (4.2.8p10-win-beta1) 2017/03/21 Released by Harlan Stenn <stenn@ntp.org>
 (4.2.8p10)
diff --git a/sntp/harden/linux b/sntp/harden/linux
index db235446e..5f9c4e91f 100644
--- a/sntp/harden/linux
+++ b/sntp/harden/linux
@@ -1,4 +1,4 @@
 # generic linux hardening flags
-NTP_HARD_CFLAGS="-pie -fPIE -fPIC -fstack-protector-all -O1"
+NTP_HARD_CFLAGS="-fPIE -fPIC -fstack-protector-all -O1"
 NTP_HARD_CPPFLAGS="-D_FORTIFY_SOURCE=2"
-NTP_HARD_LDFLAGS="-z relro -z now"
+NTP_HARD_LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
diff --git a/tests/ntpd/Makefile.am b/tests/ntpd/Makefile.am
index 02ac1a166..7a0638528 100644
--- a/tests/ntpd/Makefile.am
+++ b/tests/ntpd/Makefile.am
@@ -71,7 +71,8 @@ BUILT_SOURCES +=			\
 
 ###
 
-test_leapsec_CFLAGS =			\
+test_leapsec_CFLAGS = 			\
+	$(AM_CFLAGS)			\
 	-I$(top_srcdir)/sntp/unity	\
 	$(NULL)
 
@@ -91,6 +92,7 @@ $(srcdir)/run-leapsec.c: $(srcdir)/leapsec.c $(std_unity_list)
 
 ###
 test_ntp_prio_q_CFLAGS =		\
+	$(AM_CFLAGS)			\
 	-I$(top_srcdir)/sntp/unity	\
 	$(NULL)
 
@@ -111,6 +113,7 @@ $(srcdir)/run-ntp_prio_q.c: $(srcdir)/ntp_prio_q.c $(std_unity_list)
 
 ###
 test_ntp_restrict_CFLAGS =		\
+	$(AM_CFLAGS)			\
 	-I$(top_srcdir)/sntp/unity	\
 	$(NULL)
 
@@ -131,6 +134,7 @@ $(srcdir)/run-ntp_restrict.c: $(srcdir)/ntp_restrict.c $(std_unity_list)
 
 ###
 test_rc_cmdlength_CFLAGS =		\
+	$(AM_CFLAGS)			\
 	-I$(top_srcdir)/sntp/unity	\
 	$(NULL)
 
@@ -166,6 +170,7 @@ $(srcdir)/run-t-ntp_signd.c: $(srcdir)/t-ntp_signd.c $(std_unity_list)
 
 ###
 test_ntp_scanner_CFLAGS =		\
+	$(AM_CFLAGS)			\
 	-I$(top_srcdir)/sntp/unity	\
 	$(NULL)