From: Dave Hart <hart@ntp.org>
Date: Fri, 16 Jun 2023 05:13:03 +0000 (+0000)
Subject: Bug 3835 - NTP_HARD_*FLAGS not used by libevent tearoff.
X-Git-Tag: NTP_4_2_8P18_RC1~47^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c6021c0c87d5f03198205c35d3b54d05b263ff0;p=thirdparty%2Fntp.git

Bug 3835 - NTP_HARD_*FLAGS not used by libevent tearoff.

cvo.sh:
  Fix on newer Linux with /etc/os-release
ntp_libevent.m4:
  Newer libevent supports LIBEVENT_*FLAGS.
  Disable building samples for the bundled libevent.
configure.ac:
  One piece missing in LIBEVENT_*FLAGS support

bk: 648bef5fPmcmIFwcbzTD9M59WDOtmw
---

diff --git a/ChangeLog b/ChangeLog
index 93cdab8b9..d77a2ee98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+---
+* [Bug 3835] NTP_HARD_*FLAGS not used by libevent tearoff.
+
 ---
 (4.2.8p17) 2023/06/06 Released by Harlan Stenn <stenn@ntp.org>
 
diff --git a/sntp/libevent/configure.ac b/sntp/libevent/configure.ac
index d00e063a1..f84c237df 100644
--- a/sntp/libevent/configure.ac
+++ b/sntp/libevent/configure.ac
@@ -989,6 +989,11 @@ AC_SUBST([LIBEVENT_GC_SECTIONS])
 
 AM_CONDITIONAL([INSTALL_LIBEVENT], [test "$enable_libevent_install" = "yes"])
 
+dnl Aloow addtional flags from a containing package such as NTP
+AC_SUBST([LIBEVENT_CFLAGS])
+AC_SUBST([LIBEVENT_CPPFLAGS])
+AC_SUBST([LIBEVENT_LDFLAGS])
+
 # Doxygen support
 DX_HTML_FEATURE(ON)
 DX_MAN_FEATURE(OFF)
diff --git a/sntp/m4/ntp_libevent.m4 b/sntp/m4/ntp_libevent.m4
index 14b614b46..8e7d65b5c 100644
--- a/sntp/m4/ntp_libevent.m4
+++ b/sntp/m4/ntp_libevent.m4
@@ -181,14 +181,15 @@ case "$ntp_use_local_libevent" in
     dnl User-supplied contradictory choices should prevail thanks to
     dnl "last wins".
     ac_configure_args=" --disable-openssl${ac_configure_args}"
+    ac_configure_args=" --disable-samples${ac_configure_args}"
     ac_configure_args=" --disable-shared${ac_configure_args}"
     ac_configure_args=" --disable-libevent-regress${ac_configure_args}"
     ac_configure_args=" --disable-libevent-install${ac_configure_args}"
     ac_configure_args=" --enable-silent-rules${ac_configure_args}"
     ac_configure_args=" --enable-function-sections${ac_configure_args}"
-    ac_configure_args=" LEP_CFLAGS='${NTP_HARD_CFLAGS}'${ac_configure_args}"
-    ac_configure_args=" LEP_CPPFLAGS='${NTP_HARD_CPPFLAGS}'${ac_configure_args}"
-    ac_configure_args=" LEP_LDFLAGS='${NTP_HARD_LDFLAGS}'${ac_configure_args}"
+    ac_configure_args=" LIBEVENT_CFLAGS='${NTP_HARD_CFLAGS}'${ac_configure_args}"
+    ac_configure_args=" LIBEVENT_CPPFLAGS='${NTP_HARD_CPPFLAGS}'${ac_configure_args}"
+    ac_configure_args=" LIBEVENT_LDFLAGS='${NTP_HARD_LDFLAGS}'${ac_configure_args}"
     AC_CONFIG_SUBDIRS([libevent])
     ;;
  *)
diff --git a/sntp/scripts/cvo.sh b/sntp/scripts/cvo.sh
index ecd809223..77a161172 100755
--- a/sntp/scripts/cvo.sh
+++ b/sntp/scripts/cvo.sh
@@ -26,7 +26,13 @@ case "$#" in
     CVO_OS=$4
     case "$cvo_KERN" in
      linux)			# Braindamage.  We want OS, not kernel info
-	if lsb_release > /dev/null 2>&1
+	if test -f /etc/os-release
+	then
+	    . /etc/os-release
+	    ID=`echo $ID | tr '-' '_'`
+	    CVO_OS="${ID}${VERSION_ID}"
+	    CVO_KOSVER=`uname -r`
+	elif lsb_release > /dev/null 2>&1
 	then
 	    CVO_OS=`lsb_release --id --short | tr '[:upper:]' '[:lower:]'`
 	    CVO_OS="$CVO_OS`lsb_release --release --short`"