diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-06-23 14:32:04 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-06-23 14:32:04 +0200 |
| commit | d35470609e316f21edfd8c06f542425726aceed2 (patch) | |
| tree | 7fcdf090587441c4fe75d980bd3b4065e33ef1c3 /mk | |
| parent | a39fa94e9196def19522fb59ca1fb38e882953f3 (diff) | |
fix perl module compile on newer host perl
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/perl.mk | 3 | ||||
| -rw-r--r-- | mk/pkg-bottom.mk | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mk/perl.mk b/mk/perl.mk index dc16bcb00..a874a0b76 100644 --- a/mk/perl.mk +++ b/mk/perl.mk @@ -1,6 +1,7 @@ PERL_VERSION=5.18.1 PERL_ARCHNAME:=$(ADK_TARGET_CPU_ARCH)-linux PERL_SITEDIR:=/usr/lib/perl5/site_perl/$(PERL_VERSION) +PERL_INCDIR:=/usr/lib/perl5/$(PERL_VERSION)/$(PERL_ARCHNAME)/CORE PERL_ENV:= AR="$(TARGET_AR)" \ FULL_AR="$(TARGET_AR)" \ CC="$(TARGET_CC)" \ @@ -8,7 +9,7 @@ PERL_ENV:= AR="$(TARGET_AR)" \ LD="$(TARGET_CC)" \ LDDLFLAGS="-shared $(TARGET_LDFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \ - PERL_INC=$(STAGING_TARGET_DIR)/usr/lib/perl5/$(PERL_VERSION)/$(PERL_ARCHNAME)/CORE \ + PERL_INC=$(STAGING_TARGET_DIR)/$(PERL_INCDIR) \ DESTDIR=$(WRKINST) \ INSTALLDIRS=vendor \ INSTALLVENDORLIB=$(PERL_SITEDIR) \ diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index b3b905513..d92a3bb4c 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -69,7 +69,8 @@ else ifneq ($(filter perl,${CONFIG_STYLE}),) PATH='${HOST_PATH}' \ PERL_MM_USE_DEFAULT=1 \ PERL_AUTOINSTALL=--skipdeps \ - perl Makefile.PL $(PERL_ENV) + $(PERL_ENV) \ + perl Makefile.PL else ifeq ($(strip ${CONFIG_STYLE}),) @$(CMD_TRACE) "configuring... " cd ${WRKBUILD}; rm -f config.{cache,status}; \ |