Commit f99a66de authored by Francois Perrad's avatar Francois Perrad Committed by Peter Korsgaard
Browse files

host-perl: export and rename PERL5LIB 



The official Perl documentation refers only to PERL5LIB.
PERLLIB is obsolete, we don't need to be compatible with Perl4.

PERL5LIB is used in all environment, so it is simpler to just export it.

Signed-off-by: default avatarFrancois Perrad <francois.perrad@gadz.org>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 994bf3ce

package/Makefile.in

+5 −6
Original line number Diff line number Diff line
@@ -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')



export PERL5LIB := $(HOST_DIR)/usr/lib/perl



TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \

		AR="$(TARGET_AR)" \

		AS="$(TARGET_AS)" \
@@ -241,11 +243,10 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \ 
		LDFLAGS="$(TARGET_LDFLAGS)" \

		FCFLAGS="$(TARGET_FCFLAGS)" \

		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \

		PERLLIB="$(HOST_DIR)/usr/lib/perl" \

		STAGING_DIR="$(STAGING_DIR)"



TARGET_MAKE_ENV=PATH=$(TARGET_PATH) \

		PERLLIB="$(HOST_DIR)/usr/lib/perl"

TARGET_MAKE_ENV=PATH=$(TARGET_PATH)





HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \

		AR="$(HOSTAR)" \
@@ -267,15 +268,13 @@ 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" \

		LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib:$(LD_LIBRARY_PATH)"



HOST_MAKE_ENV=PATH=$(HOST_PATH) \

		LD_LIBRARY_PATH="$(HOST_DIR)/usr/lib:$(LD_LIBRARY_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"

		PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig"



# This extra environment we can not export ourselves (eg. because some

# packages use that variable internally, eg. uboot), so we have to

package/intltool/intltool.mk

+0 −2
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ 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



$(eval $(autotools-package))

$(eval $(host-autotools-package))