diff options
author | Christian Melki <christian.melki@t2data.com> | 2021-09-03 20:34:52 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2021-09-08 15:47:20 +0200 |
commit | b1f105188231b3b0938cf68f1247e6a07e24b4d9 (patch) | |
tree | 3773718788c076f0c7699182772fa7218098c3af | |
parent | 8a2b1ac5e9a945b43d7adf161f8edff8703f42e1 (diff) | |
download | ptxdist-b1f105188231b3b0938cf68f1247e6a07e24b4d9.tar.gz ptxdist-b1f105188231b3b0938cf68f1247e6a07e24b4d9.tar.xz |
syslogng: Use CROSS_LIB_DIR for module paths
Be more specific about where modules (.so files) end up and searched for.
Let them land in a CROSS_LIB_DIR path.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
Message-Id: <20210903183452.2754560-1-christian.melki@t2data.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r-- | rules/syslogng.make | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/rules/syslogng.make b/rules/syslogng.make index d5ac92797..41bdec766 100644 --- a/rules/syslogng.make +++ b/rules/syslogng.make @@ -41,6 +41,8 @@ SYSLOGNG_ENV = \ SYSLOGNG_AUTOCONF = \ $(CROSS_AUTOCONF_USR) \ --localstatedir=/var/run \ + --with-module-dir=/usr/$(CROSS_LIB_DIR)/syslog-ng \ + --with-module-path=/usr/$(CROSS_LIB_DIR)/syslog-ng \ --enable-forced-server-mode \ --disable-debug \ --enable-force-gnu99 \ @@ -99,7 +101,7 @@ $(STATEDIR)/syslogng.install: @$(call targetinfo) @$(call world/install, SYSLOGNG) # # test plugins, not needed on the target - @rm -r "$(SYSLOGNG_PKGDIR)/usr/lib/syslog-ng/loggen" + @rm -r "$(SYSLOGNG_PKGDIR)/usr/$(CROSS_LIB_DIR)/syslog-ng/loggen" @$(call touch) @@ -122,7 +124,7 @@ $(STATEDIR)/syslogng.targetinstall: @$(call install_lib, syslogng, 0, 0, 0644, libsyslog-ng-$(SYSLOG_LIBVERSION)) @$(call install_lib, syslogng, 0, 0, 0644, libevtlog-$(SYSLOG_LIBVERSION)) @$(call install_lib, syslogng, 0, 0, 0644, libsecret-storage) - @$(call install_glob, syslogng, 0, 0, -, /usr/lib/syslog-ng, *.so) + @$(call install_glob, syslogng, 0, 0, -, /usr/$(CROSS_LIB_DIR)/syslog-ng, *.so) # # config ifdef PTXCONF_SYSLOGNG_CONFIG |