[Buildroot] [pkg-perl infra V4 1/9] pkg-perl: refactor and rename PERL5LIB

[François Perrad]

2014-02-06 7:29 GMT+01:00 Arnout Vandecappelle <arnout at mind.be>:
> On 05/02/14 14:52, Francois Perrad wrote:
>>
>> Signed-off-by: Francois Perrad <francois.perrad at gadz.org>
>> ---
>>  package/Makefile.in          |   11 +++++++----
>>  package/intltool/intltool.mk |    3 +--
>>  2 files changed, 8 insertions(+), 6 deletions(-)
>>
>> diff --git a/package/Makefile.in b/package/Makefile.in
>> index 2e433fd..d0b1cfd 100644
>> --- a/package/Makefile.in
>> +++ b/package/Makefile.in
>> @@ -206,6 +206,8 @@ HOST_PATH=$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(PATH)
>>  HOSTCC_VERSION:=$(shell $(HOSTCC_NOCCACHE) --version | \
>>       sed -n 's/^.* \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)[ ]*.*$$/\1\2\3/p')
>>
>> +HOST_PERL5LIB = $(HOST_DIR)/usr/lib/perl
>> +
>>  TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
>>               AR="$(TARGET_AR)" \
>>               AS="$(TARGET_AS)" \
>> @@ -241,11 +243,12 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
>>               LDFLAGS="$(TARGET_LDFLAGS)" \
>>               FCFLAGS="$(TARGET_FCFLAGS)" \
>>               PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
>> -             PERLLIB="$(HOST_DIR)/usr/lib/perl" \
>> +             PERL5LIB=$(HOST_PERL5LIB) \
>>               STAGING_DIR="$(STAGING_DIR)"
>>
>>  TARGET_MAKE_ENV=PATH=$(TARGET_PATH) \
>> -             PERLLIB="$(HOST_DIR)/usr/lib/perl"
>> +             PERL5LIB=$(HOST_PERL5LIB)
>> +
>>
>>  HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \
>>               AR="$(HOSTAR)" \
>> @@ -267,7 +270,7 @@ HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \
>>               PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
>>               PKG_CONFIG_SYSROOT_DIR="/" \
>>               PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig:$(HOST_DIR)/usr/share/pkgconfig" \
>> -             PERLLIB="$(HOST_DIR)/usr/lib/perl" \
>> +             PERL5LIB=$(HOST_PERL5LIB) \
>>               LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib:$(LD_LIBRARY_PATH)"
>>
>>  HOST_MAKE_ENV=PATH=$(HOST_PATH) \
>> @@ -275,7 +278,7 @@ HOST_MAKE_ENV=PATH=$(HOST_PATH) \
>>               PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
>>               PKG_CONFIG_SYSROOT_DIR="/" \
>>               PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig" \
>> -             PERLLIB="$(HOST_DIR)/usr/lib/perl"
>> +             PERL5LIB=$(HOST_PERL5LIB)
>>
>>  # This extra environment we can not export ourselves (eg. because some
>>  # packages use that variable internally, eg. uboot), so we have to
>> diff --git a/package/intltool/intltool.mk b/package/intltool/intltool.mk
>> index b2418fe..4235606 100644
>> --- a/package/intltool/intltool.mk
>> +++ b/package/intltool/intltool.mk
>> @@ -10,8 +10,7 @@ INTLTOOL_LICENSE = GPLv2+
>>  INTLTOOL_LICENSE_FILES = COPYING
>>
>>  HOST_INTLTOOL_DEPENDENCIES = host-gettext host-libxml-parser-perl
>> -HOST_INTLTOOL_CONF_OPT = \
>> -  PERLLIB=$(HOST_DIR)/usr/lib/perl
>> +HOST_INTLTOOL_CONF_ENV = PERL5LIB=$(HOST_PERL5LIB)
>
>  Can't this one just be removed, since it's already in HOST_CONFIGURE_OPTS?

You are right, there is a duplication.

François

>
>  If so, indicate this explicitly in your commit message please.
>
>
>  Regards,
>  Arnout
>
>>
>>  $(eval $(autotools-package))
>>  $(eval $(host-autotools-package))
>>
>
>
> --
> Arnout Vandecappelle                          arnout at mind be
> Senior Embedded Software Architect            +32-16-286500
> Essensium/Mind                                http://www.mind.be
> G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
> LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
> GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot