From mboxrd@z Thu Jan 1 00:00:00 1970 From: Romain Naour Date: Sun, 18 Jan 2015 19:57:25 +0100 Subject: [Buildroot] [PATCH 1/3] package/rpm: add gettext dependency In-Reply-To: <20150118142135.GF4275@free.fr> References: <1421580900-15186-1-git-send-email-romain.naour@openwide.fr> <20150118142135.GF4275@free.fr> Message-ID: <54BC0215.6090203@openwide.fr> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net Hi Yann, all Le 18/01/2015 15:21, Yann E. MORIN a ?crit : > Romain, All, > > On 2015-01-18 12:34 +0100, Romain Naour spake thusly: >> rpm check for libintl library if BR2_NEEDS_GETTEXT_IF_LOCALE is set. >> >> checking for GNU gettext in libintl... yes >> checking whether to use NLS... yes >> checking where the gettext function comes from... external libintl >> checking how to link with libintl... -lintl > > Do you ave a defconfig with which I could test, please? Yes, see: http://autobuild.buildroot.net/results/2c6/2c61562008418ff58fa3085a3342b0e304923073/config I'm fixing a autobuild failure, but while doing 'make rpm' the failure didn't happened. So I make a diff with my build.log and the build-end.log provided by the autobuilder. That is how I found the missing dependency on gettext. > >> But the dependency on gettext package is missing to ensures >> reproducible builds. >> >> Also, sort selected packages alphabetically in Config.in > > I would prefer we do not mix feature changes with eye-candy, it makes > reviewing a bit more complicated than it should be. Next time, could you > just do that in a different patch, please? Yes, sorry. While rebasing to clean up this series, I wasn't happy that the select BR2_PACKAGE_* wasn't alphabetically sorted. I'll do that in a other patch. Thanks for your review :) Best regards, Romain > > Regards, > Yann E. MORIN. > >> Signed-off-by: Romain Naour >> --- >> package/rpm/Config.in | 7 ++++--- >> package/rpm/rpm.mk | 4 ++++ >> 2 files changed, 8 insertions(+), 3 deletions(-) >> >> diff --git a/package/rpm/Config.in b/package/rpm/Config.in >> index 620eb1a..5ec4167 100644 >> --- a/package/rpm/Config.in >> +++ b/package/rpm/Config.in >> @@ -7,12 +7,13 @@ config BR2_PACKAGE_RPM >> depends on BR2_TOOLCHAIN_HAS_THREADS # beecrypt >> depends on BR2_USE_MMU # fork() >> select BR2_PACKAGE_BEECRYPT >> - select BR2_PACKAGE_POPT >> - select BR2_PACKAGE_OPENSSL >> + select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE >> select BR2_PACKAGE_NEON >> + select BR2_PACKAGE_NEON_SSL >> select BR2_PACKAGE_NEON_XML >> select BR2_PACKAGE_NEON_ZLIB >> - select BR2_PACKAGE_NEON_SSL >> + select BR2_PACKAGE_OPENSSL >> + select BR2_PACKAGE_POPT >> select BR2_PACKAGE_ZLIB >> help >> The RPM package management system. >> diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk >> index c4215b5..74f5b88 100644 >> --- a/package/rpm/rpm.mk >> +++ b/package/rpm/rpm.mk >> @@ -26,6 +26,10 @@ RPM_CONF_OPTS = \ >> --with-libbeecrypt=$(STAGING_DIR) \ >> --with-popt=$(STAGING_DIR) >> >> +ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) >> +RPM_DEPENDENCIES += gettext >> +endif >> + >> ifeq ($(BR2_PACKAGE_PCRE),y) >> RPM_DEPENDENCIES += pcre >> RPM_CONF_OPTS += --with-pcre=external >> -- >> 1.9.3 >> >> _______________________________________________ >> buildroot mailing list >> buildroot at busybox.net >> http://lists.busybox.net/mailman/listinfo/buildroot >