mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-10-01 09:45:03 +00:00
30277c1280
Backport patches from syslog-ng for options to disable awk. Gawk dependency in syslog-ng can only be turned off in the right way via options. Signed-off-by: Alexander Yurkov <alexander.v.yurkov@gmail.com> Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
56 lines
2.1 KiB
Diff
56 lines
2.1 KiB
Diff
From dc42135ae830e34df7939bf3c08934904c402fa6 Mon Sep 17 00:00:00 2001
|
|
From: Alexander Yurkov <alexander.v.yurkov@gmail.com>
|
|
Date: Thu, 28 May 2026 21:04:27 +0000
|
|
Subject: [PATCH] feat: Add option in autotools to remove awk.
|
|
|
|
The option is to avoid licensing issues, and awk is turned off by
|
|
default.
|
|
|
|
Upstream-Status: Backport [eda6d019710048e81f00f3497d5f1143f3eca803]
|
|
|
|
Signed-off-by: Alexander Yurkov <alexander.v.yurkov@gmail.com>
|
|
---
|
|
configure.ac | 7 +++++++
|
|
scl/Makefile.am | 3 +++
|
|
2 files changed, 10 insertions(+)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index b283836..b6c487b 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -639,6 +639,12 @@ AC_ARG_ENABLE(all-modules,
|
|
AS_HELP_STRING([--enable-all-modules], [Forcibly enable all modules. (default: auto)]),
|
|
, enable_all_modules="auto")
|
|
|
|
+AC_ARG_ENABLE([scl-syslogconf-awk],
|
|
+ [AS_HELP_STRING([--disable-scl-syslogconf-awk],
|
|
+ [Do not install scl/syslogconf/convert-syslogconf.awk])],
|
|
+ [],
|
|
+ [enable_scl_syslogconf_awk=yes])
|
|
+
|
|
if test "x$enable_all_modules" != "xauto"; then
|
|
state="$enable_all_modules"
|
|
|
|
@@ -2685,6 +2691,7 @@ AM_CONDITIONAL([HAVE_GETRANDOM], [test x$ac_cv_func_getrandom = xyes])
|
|
AM_CONDITIONAL([HAVE_FMEMOPEN], [test x$ac_cv_func_fmemopen = xyes])
|
|
AM_CONDITIONAL([HAVE_JAVAH], [test -n "$JAVAH_BIN"])
|
|
AM_CONDITIONAL(ENABLE_IPV6, [test $enable_ipv6 = yes])
|
|
+AM_CONDITIONAL([ENABLE_SCL_SYSLOGCONF_AWK], [test "x$enable_scl_syslogconf_awk" = "xyes"])
|
|
|
|
AM_CONDITIONAL(OS_TYPE_MACOS, [test $ostype = "Darwin"])
|
|
AM_CONDITIONAL(OS_TYPE_FREEBSD, [test $ostype = "FreeBSD"])
|
|
diff --git a/scl/Makefile.am b/scl/Makefile.am
|
|
index 17d1a55..62b9d01 100644
|
|
--- a/scl/Makefile.am
|
|
+++ b/scl/Makefile.am
|
|
@@ -71,6 +71,9 @@ scl-install-data-local:
|
|
$(install_sh_DATA) $(srcdir)/scl/scl.conf $(DESTDIR)/$(config_includedir)/scl.conf; \
|
|
fi
|
|
(cd $(srcdir)/scl; tar cf - $(SCL_SUBDIRS)) | (cd $(DESTDIR)/$(scldir) && tar xf - --no-same-owner)
|
|
+if !ENABLE_SCL_SYSLOGCONF_AWK
|
|
+ rm -f $(DESTDIR)/$(scldir)/syslogconf/convert-syslogconf.awk
|
|
+endif
|
|
chmod -R u+rwX $(DESTDIR)/$(scldir)
|
|
|
|
scl-uninstall-local:
|