mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Christian Melki <christian.melki@t2data.com>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH] rules/syslogng.make:
Date: Mon, 30 Aug 2021 13:54:23 +0200	[thread overview]
Message-ID: <20210830115423.570707-1-christian.melki@t2data.com> (raw)

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>
---
 rules/syslogng.make | 6 ++++--
 1 file 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
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de


             reply	other threads:[~2021-08-30 11:55 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-30 11:54 Christian Melki [this message]
2021-09-03 15:27 ` Michael Olbrich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210830115423.570707-1-christian.melki@t2data.com \
    --to=christian.melki@t2data.com \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox