diff options
| author | Philip Prindeville <philipp@redfish-solutions.com> | 2018-01-26 16:41:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-26 16:41:46 -0700 |
| commit | cda0e18b27d58f877876501811652c74afe410c8 (patch) | |
| tree | 955f624575c7367bedfa53ed7ca2cc4eff248875 /lang/perl | |
| parent | 951f1da08b13d614030df249b31ff568f840010c (diff) | |
| parent | 1e0db9ba80fe0bd43c2312cf16dc1e2dd3a3e6b1 (diff) | |
Merge pull request #5504 from pprindeville/perl-cleanup
perlmod: avoid 'do' semantics and just concatenate
Diffstat (limited to 'lang/perl')
| -rw-r--r-- | lang/perl/Makefile | 2 | ||||
| -rw-r--r-- | lang/perl/perlmod.mk | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/lang/perl/Makefile b/lang/perl/Makefile index 5e20f6cb3..b6111aad4 100644 --- a/lang/perl/Makefile +++ b/lang/perl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl PKG_VERSION:=5.26.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_URL:=\ https://cpan.metacpan.org/src/5.0 \ diff --git a/lang/perl/perlmod.mk b/lang/perl/perlmod.mk index 04ae49053..551d4532b 100644 --- a/lang/perl/perlmod.mk +++ b/lang/perl/perlmod.mk @@ -55,9 +55,10 @@ endef define perlmod/Configure (cd $(if $(3),$(3),$(PKG_BUILD_DIR)); \ - PERL_MM_USE_DEFAULT=1 \ - $(2) \ - $(PERL_CMD) -MConfig -e '$$$${tied %Config::Config}{cpprun}="$(GNU_TARGET_NAME)-cpp -E"; unshift(@INC, "."); unless (defined (do "./Makefile.PL")) { if ($$$$@) { die "couldn\047t parse Makefile.PL: $$$$@"; } elsif ($$$$!) { die "Could\047t run Makefile.PL: $$$$!"; } }; die "No Makefile generated!" unless -f "Makefile";' \ + (echo -e 'use Config;\n\n$$$${tied %Config::Config}{cpprun}="$(GNU_TARGET_NAME)-cpp -E";\n' ; cat Makefile.PL) | \ + PERL_MM_USE_DEFAULT=1 \ + $(2) \ + $(PERL_CMD) -I. -- - \ $(1) \ AR=ar \ CC=$(GNU_TARGET_NAME)-gcc \ @@ -103,8 +104,8 @@ define perlmod/Configure INSTALLVENDORMAN3DIR=" " \ LINKTYPE=dynamic \ DESTDIR=$(PKG_INSTALL_DIR) \ - ); - sed 's!^PERL_INC = .*!PERL_INC = $(STAGING_DIR)/usr/lib/perl5/$(PERL_VERSION)/CORE/!' -i $(if $(3),$(3),$(PKG_BUILD_DIR))/Makefile + ) + sed -i -e 's!^PERL_INC = .*!PERL_INC = $(STAGING_DIR)/usr/lib/perl5/$(PERL_VERSION)/CORE/!' $(if $(3),$(3),$(PKG_BUILD_DIR))/Makefile endef define perlmod/Compile |