From 83effa6fd40639a1d822e8227b1dec585712bd8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20Walstr=C3=B6m?= <lazzer@gmail.com>
Date: Fri, 23 Feb 2024 09:30:36 +0100
Subject: [PATCH] Use common CFLAGS in all src-packages.

And fix bugs that the new CFLAGS find.
---
 package/confd/confd.mk                           |  4 ++++
 package/factory/factory.mk                       |  4 ++++
 package/klish-plugin-infix/klish-plugin-infix.mk |  4 ++++
 package/libsrx/libsrx.mk                         |  4 +++-
 package/statd/statd.mk                           |  4 ++++
 src/confd/src/Makefile.am                        |  1 -
 src/confd/src/infix-dhcp.c                       | 15 ++++++++-------
 7 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/package/confd/confd.mk b/package/confd/confd.mk
index 2a370584..1fb2abf6 100644
--- a/package/confd/confd.mk
+++ b/package/confd/confd.mk
@@ -4,6 +4,7 @@
 #
 ################################################################################
 
+
 CONFD_VERSION = 1.0
 CONFD_SITE_METHOD = local
 CONFD_SITE = $(BR2_EXTERNAL_INFIX_PATH)/src/confd
@@ -12,6 +13,9 @@ CONFD_LICENSE_FILES = LICENSE
 CONFD_REDISTRIBUTE = NO
 CONFD_DEPENDENCIES = augeas jansson libite sysrepo libsrx
 CONFD_AUTORECONF = YES
+define CONFD_CONF_ENV
+CFLAGS="$(INFIX_CFLAGS)"
+endef
 
 define CONFD_INSTALL_EXTRA
 	cp $(CONFD_PKGDIR)/confd.conf  $(FINIT_D)/available/
diff --git a/package/factory/factory.mk b/package/factory/factory.mk
index 52bbb487..1d76d346 100644
--- a/package/factory/factory.mk
+++ b/package/factory/factory.mk
@@ -11,6 +11,10 @@ FACTORY_SITE_METHOD = local
 FACTORY_SITE = $(BR2_EXTERNAL_INFIX_PATH)/src/factory
 FACTORY_REDISTRIBUTE = NO
 
+define FACTORY_CONF_ENV
+CFLAGS="$(INFIX_CFLAGS)"
+endef
+
 define FACTORY_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
 		LDLIBS="$(TARGET_LDFLAGS)"
diff --git a/package/klish-plugin-infix/klish-plugin-infix.mk b/package/klish-plugin-infix/klish-plugin-infix.mk
index 8cd03fdb..d42caabc 100644
--- a/package/klish-plugin-infix/klish-plugin-infix.mk
+++ b/package/klish-plugin-infix/klish-plugin-infix.mk
@@ -13,6 +13,10 @@ KLISH_PLUGIN_INFIX_REDISTRIBUTE = NO
 KLISH_PLUGIN_INFIX_DEPENDENCIES = klish-plugin-sysrepo
 KLISH_PLUGIN_INFIX_AUTORECONF = YES
 
+define KLISH_PLUGIN_INFIX_CONF_ENV
+CFLAGS="$(INFIX_CFLAGS)"
+endef
+
 define KLISH_PLUGIN_INFIX_INSTALL_DOC
 	$(INSTALL) -t $(TARGET_DIR)/usr/share/infix/cli -D -m 0644 \
 		$(wildcard $(BR2_EXTERNAL_INFIX_PATH)/doc/cli/*.md)
diff --git a/package/libsrx/libsrx.mk b/package/libsrx/libsrx.mk
index 1aa317f6..519318a2 100644
--- a/package/libsrx/libsrx.mk
+++ b/package/libsrx/libsrx.mk
@@ -13,5 +13,7 @@ LIBSRX_INSTALL_STAGING = YES
 LIBSRX_REDISTRIBUTE = NO
 LIBSRX_DEPENDENCIES = sysrepo
 LIBSRX_AUTORECONF = YES
-
+define LIBSRX_CONF_ENV
+CFLAGS="$(INFIX_CFLAGS)"
+endef
 $(eval $(autotools-package))
diff --git a/package/statd/statd.mk b/package/statd/statd.mk
index 81b2d947..a4257486 100644
--- a/package/statd/statd.mk
+++ b/package/statd/statd.mk
@@ -12,6 +12,10 @@ STATD_LICENSE_FILES = LICENSE
 STATD_REDISTRIBUTE = NO
 STATD_DEPENDENCIES = sysrepo libev libsrx jansson
 
+define STATD_CONF_ENV
+CFLAGS="$(INFIX_CFLAGS)"
+endef
+
 define STATD_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
 		LDFLAGS="$(TARGET_LDFLAGS)"
diff --git a/src/confd/src/Makefile.am b/src/confd/src/Makefile.am
index cdf8a986..6334536c 100644
--- a/src/confd/src/Makefile.am
+++ b/src/confd/src/Makefile.am
@@ -1,4 +1,3 @@
-CFLAGS                 += -Wall -Wextra -Werror -Wno-unused-parameter
 AM_CPPFLAGS             = -D_DEFAULT_SOURCE -D_XOPEN_SOURCE -D_GNU_SOURCE -DYANG_PATH_=\"$(YANGDIR)\"
 CLEANFILES              = $(rauc_installer_sources)
 plugindir               = $(srpdplugindir)
diff --git a/src/confd/src/infix-dhcp.c b/src/confd/src/infix-dhcp.c
index 9c421d8d..e7856cd3 100644
--- a/src/confd/src/infix-dhcp.c
+++ b/src/confd/src/infix-dhcp.c
@@ -13,9 +13,10 @@
 #include <srx/srx_val.h>
 
 #include "core.h"
-#define  ARPING_MSEC  1000
-#define  MODULE       "infix-dhcp-client"
-#define  XPATH        "/infix-dhcp-client:dhcp-client"
+#define  ARPING_MSEC    1000
+#define  MODULE         "infix-dhcp-client"
+#define  XPATH          "/infix-dhcp-client:dhcp-client"
+#define  CACHE_TEMPLATE "/var/lib/misc/%s.cache"
 
 static const struct srx_module_requirement reqs[] = {
 	{ .dir = YANG_PATH_, .name = MODULE, .rev = "2024-01-30" },
@@ -25,15 +26,15 @@ static const struct srx_module_requirement reqs[] = {
 
 static char *ip_cache(const char *ifname, char *str, size_t len)
 {
-	const char *fn = "/var/lib/misc/%s.cache";
+
 	struct in_addr ina;
 	char buf[128];
 	FILE *fp;
 
-	if (!fexistf(fn, ifname))
+	if (!fexistf(CACHE_TEMPLATE, ifname))
 		return NULL;
 
-	fp = fopenf("r", fn, ifname);
+	fp = fopenf("r", CACHE_TEMPLATE, ifname);
 	if (!fp)
 		return NULL;
 
@@ -45,7 +46,7 @@ static char *ip_cache(const char *ifname, char *str, size_t len)
 	chomp(buf);
 
 	if (!inet_aton(buf, &ina)) {
-		erasef(fn, ifname);
+		erasef(CACHE_TEMPLATE, ifname);
 		return NULL;
 	}