From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/2] e2fsprogs: simplify handling of ldconfig for target variant
Date: Fri, 31 Aug 2018 23:12:40 +0200 [thread overview]
Message-ID: <20180831211240.20322-2-thomas.petazzoni@bootlin.com> (raw)
In-Reply-To: <20180831211240.20322-1-thomas.petazzoni@bootlin.com>
e2fsprogs now has a proper autoconf check for ldconfig, so we can
simply pass the apropriate ac_cv_path_LDCONFIG variable at configure
time, and it gets used at build/install time without having to force
LDCONFIG=true at every step.
Since the E2FSPROGS_INSTALL_TARGET_OPTS become the default, we can get
rid of them entirely.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
package/e2fsprogs/e2fsprogs.mk | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 5fe1ff8e68..4de469216e 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -64,7 +64,9 @@ endif
# the configure script (i.e with the cross-compiler). Help them by
# saying that <sys/stat.h> is available on the host, which is needed
# for util/subst.c to build properly.
-E2FSPROGS_CONF_ENV += BUILD_CFLAGS="-DHAVE_SYS_STAT_H"
+E2FSPROGS_CONF_ENV += \
+ BUILD_CFLAGS="-DHAVE_SYS_STAT_H" \
+ ac_cv_path_LDCONFIG=true
# Disable use of the host magic.h, as on older hosts (e.g. RHEL 5)
# it doesn't provide definitions expected by e2fsprogs support lib.
@@ -73,18 +75,10 @@ HOST_E2FSPROGS_CONF_ENV += \
ac_cv_lib_magic_magic_file=no \
ac_cv_path_LDCONFIG=true
-E2FSPROGS_MAKE_OPTS = LDCONFIG=true
-
E2FSPROGS_INSTALL_STAGING_OPTS = \
DESTDIR=$(STAGING_DIR) \
- LDCONFIG=true \
install-libs
-E2FSPROGS_INSTALL_TARGET_OPTS = \
- DESTDIR=$(TARGET_DIR) \
- LDCONFIG=true \
- install
-
define HOST_E2FSPROGS_INSTALL_CMDS
$(HOST_MAKE_ENV) $(MAKE) -C $(@D) install install-libs
endef
--
2.14.4
next prev parent reply other threads:[~2018-08-31 21:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-31 21:12 [Buildroot] [PATCH 1/2] e2fsprogs: do not use ldconfig when building the host variant Thomas Petazzoni
2018-08-31 21:12 ` Thomas Petazzoni [this message]
2018-09-09 13:22 ` Thomas Petazzoni
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=20180831211240.20322-2-thomas.petazzoni@bootlin.com \
--to=thomas.petazzoni@bootlin.com \
--cc=buildroot@busybox.net \
/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