From a1e4dd4eba9c81133b24b1e71ba5fa2a283fd499 Mon Sep 17 00:00:00 2001 From: Marcel Denia Date: Sat, 19 Jul 2014 03:13:12 +0200 Subject: [PATCH 01/15] lang/perl: Set archlib symbol in mipsel configuration Signed-off-by: Marcel Denia --- lang/perl/files/config.sh-mipsel.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/perl/files/config.sh-mipsel.in b/lang/perl/files/config.sh-mipsel.in index 22a8eab8ec..d3ebbe28bc 100644 --- a/lang/perl/files/config.sh-mipsel.in +++ b/lang/perl/files/config.sh-mipsel.in @@ -34,8 +34,6 @@ aphostname='/bin/hostname' api_revision='5' api_subversion='0' ar='ar' -archlib='' -archlibexp='' archname64='' archname='mipsel-linux-uclibc' archobjs='' @@ -1136,6 +1134,8 @@ installsitelib='/usr/lib/perl5/5.20' nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version' privlib='/usr/lib/perl5/5.20' privlibexp='/usr/lib/perl5/5.20' +archlib='/usr/lib/perl5/5.20' +archlibexp='/usr/lib/perl5/5.20' version='5.20.0' version_patchlevel_string='version 20 subversion 0' PERL_VERSION=20 From 551609e8485d155b369ef1ab77767814f58c0779 Mon Sep 17 00:00:00 2001 From: Marcel Denia Date: Sat, 19 Jul 2014 03:13:48 +0200 Subject: [PATCH 02/15] lang/perl: Refactor Makefile This is a kind of big commit. Summary: - Integrate better into OpenWRT's infrastructure - > Build host-perl using host-build.mk - > Install host-perl to STAGING_DIR_HOST - Remove microperl(for now) Signed-off-by: Marcel Denia --- lang/perl/Makefile | 132 ++++++++------------------------------------- 1 file changed, 23 insertions(+), 109 deletions(-) diff --git a/lang/perl/Makefile b/lang/perl/Makefile index 963ee1e003..4fdf30583d 100644 --- a/lang/perl/Makefile +++ b/lang/perl/Makefile @@ -27,15 +27,20 @@ PKG_LICENSE_FILES:=Copying Artistic README PKG_MAINTAINER:=Marcel Denia PKG_BUILD_DIR:=$(BUILD_DIR)/perl/$(PKG_NAME)-$(PKG_VERSION) +PKG_INSTALL:=1 +PKG_BUILD_DEPENDS:=perl/host +PKG_BUILD_PARALLEL:=1 +HOST_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/host-build.mk ifneq ($(CONFIG_USE_EGLIBC),) EXTRA_LIBS:=bsd EXTRA_LIBDIRS:=$(STAGING_DIR)/lib endif -define Package/perl/Default +define Package/perl SUBMENU:=Perl SECTION:=lang CATEGORY:=Languages @@ -44,75 +49,24 @@ define Package/perl/Default DEPENDS:=+USE_EGLIBC:libbsd endef -define Package/microperl -$(call Package/perl/Default) - TITLE+=(minimal version) -endef - -define Package/microperl/description - A perl package without operating-specific functions such as readdir. -endef - -define Build/Template - -$(STAMP_CONFIGURED)-$(1): $(STAMP_PREPARED) - -$(MAKE) -C $(PKG_BUILD_DIR) clean - $(call Build/$(1)/Configure) - touch $$@ - -$(STAMP_BUILT)-$(1): $(STAMP_CONFIGURED)-$(1) - $(call Build/$(1)/Compile) - touch $$@ - -$(STAMP_BUILT): $(STAMP_BUILT)-$(1) - -endef - -define Build/microperl/Configure -endef - -define Build/microperl/Compile - +$(MAKE) $(MAKE_J) -C $(PKG_BUILD_DIR) -f Makefile.micro \ - CC="gcc" ugenerate_uudmap - +$(MAKE) $(MAKE_J) -C $(PKG_BUILD_DIR) -f Makefile.micro \ - CC="$(TARGET_CC)" OPTIMIZE="$(TARGET_CFLAGS)" - $(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/bin/ - $(CP) $(PKG_BUILD_DIR)/microperl $(PKG_INSTALL_DIR)/usr/bin/ -endef - -define Package/microperl/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/microperl $(1)/usr/bin/ -endef - -include perlmod.mk - -define Package/perl -$(call Package/perl/Default) -endef - define Package/perl/description Perl is a stable, cross platform programming language. It is used for mission critical projects in the public and private sectors and is widely used to program web applications of all needs. endef -define Build/perl/Configure - @echo - @echo "===> Stage 1: Configure host perl" - @echo - mkdir -p $(PKG_BUILD_DIR)/host-perl - (cd $(PKG_BUILD_DIR)/host-perl && sh ../Configure -der -Dmksymlinks -Uusedl -Dotherlibdirs=$(PERL_LIB)) +HOST_PERL_DIR:=$(STAGING_DIR_HOST)/usr +define Host/Configure + ( cd $(HOST_BUILD_DIR); ./Configure -der -Uusedl -Dprefix=$(HOST_PERL_DIR) ) +endef - @echo - @echo "===> Stage 2: Build host perl binary with static extensions" - @echo - +$(MAKE) $(MAKE_J) -C $(PKG_BUILD_DIR)/host-perl miniperl +define Host/Install + ( cd $(HOST_BUILD_DIR); ./miniperl installperl ) + #--destdir=$(STAGING_DIR_HOST) + $(CP) $(HOST_BUILD_DIR)/generate_uudmap $(HOST_PERL_DIR)/bin/ +endef - @echo - @echo "===> Stage 3: Configure target perl" - @echo - -$(MAKE) -C $(PKG_BUILD_DIR) clean +define Build/Configure sed \ -e 's!%%CC%%!$(TARGET_CC)!g' \ -e 's!%%CFLAGS%%!$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)!g' \ @@ -125,37 +79,16 @@ define Build/perl/Configure -e 's!%%EXTRA_PERLLIBS%%!$(EXTRA_LIBS:%=-l%)!g' \ -e 's!%%EXTRA_PERLLIBDIRS%%!$(EXTRA_LIBDIRS:%=-L%)!g' \ -e 's!%%IPV6%%!$(if $($(CONFIG_IPV6)),define,undef)!g' \ - -e 's!%%HOSTMINIPERL%%!$(PKG_BUILD_DIR)/host-perl/miniperl!g' \ - -e 's!%%HOSTGENERATE%%!$(PKG_BUILD_DIR)/host-perl/generate_uudmap!g' \ + -e 's!%%HOSTMINIPERL%%!$(HOST_PERL_DIR)/bin/perl!g' \ + -e 's!%%HOSTGENERATE%%!$(HOST_PERL_DIR)/bin/generate_uudmap!g' \ files/config.sh-$(patsubst i386,i486,$(ARCH)).in \ > $(PKG_BUILD_DIR)/config.sh (cd $(PKG_BUILD_DIR) && ./Configure -S) + install -m 0644 $(PKG_BUILD_DIR)/config.h $(PKG_BUILD_DIR)/xconfig.h endef -define Build/perl/Compile - @echo - @echo "===> Stage 4: Build target perl binary" - @echo - install -m 0644 $(PKG_BUILD_DIR)/config.h $(PKG_BUILD_DIR)/xconfig.h - +$(MAKE) $(MAKE_J) -C $(PKG_BUILD_DIR) perl - mkdir -p $(PKG_BUILD_DIR)/target-bin - install -m 0755 $(PKG_BUILD_DIR)/perl $(PKG_BUILD_DIR)/target-bin/ - - @echo - @echo "===> Stage 5: Build target extensions and utils" - @echo - +$(MAKE) $(MAKE_J) -C $(PKG_BUILD_DIR) - - @echo - @echo "===> Stage 6: Install Perl into staging dir" - @echo - (cd $(PKG_BUILD_DIR) && ./miniperl installperl --destdir=$(STAGING_DIR)) - - @echo - @echo "===> Stage 7: Install Perl into a temporary root" - @echo - mkdir -p $(PKG_INSTALL_DIR) - (cd $(PKG_BUILD_DIR) && ./miniperl installperl --destdir=$(PKG_INSTALL_DIR)) +define Build/Compile + +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) endef define Package/perl/install @@ -164,31 +97,12 @@ define Package/perl/install ln -nsf perl$(PKG_VERSION) $(1)/usr/bin/perl endef -ifneq ($(CONFIG_PACKAGE_microperl),) -define Build/microperl - $(call Build/Template,microperl) -endef -endif -$(eval $(Build/microperl)) - -ifneq ($(CONFIG_PACKAGE_perl),) -define Build/perl - $(call Build/Template,perl) -endef -endif -$(eval $(Build/perl)) - -define Build/Configure -endef - -define Build/Compile -endef - $(eval $(call RequireCommand,rsync, \ $(PKG_NAME) requires rsync installed on the host-system. \ )) -$(eval $(call BuildPackage,microperl)) $(eval $(call BuildPackage,perl)) +$(eval $(call HostBuild)) +include perlmod.mk -include perlbase.mk From eb52e56950d17ecc82c49547254c23291f905ff9 Mon Sep 17 00:00:00 2001 From: Marcel Denia Date: Sat, 19 Jul 2014 05:13:56 +0200 Subject: [PATCH 03/15] lang/perl: Remove PERL_LIB from perlmod.mk Signed-off-by: Marcel Denia --- lang/perl/perlmod.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lang/perl/perlmod.mk b/lang/perl/perlmod.mk index ba23297e5e..d424aa2b5d 100644 --- a/lang/perl/perlmod.mk +++ b/lang/perl/perlmod.mk @@ -3,20 +3,16 @@ # Build environment PERL_CMD := $(STAGING_DIR)/usr/bin/perl -PERL_LIB := $(STAGING_DIR)/usr/lib/perl5/5.20 # Module install prefix PERL_SITELIB := /usr/lib/perl5/5.20 define perlmod/Configure (cd $(PKG_BUILD_DIR); \ - PERL5LIB=$(PERL_LIB) \ PERL_MM_USE_DEFAULT=1 \ $(2) \ $(PERL_CMD) Makefile.PL \ $(1) \ - PERL_LIB=$(PERL_LIB) \ - PERL_ARCHLIB=$(PERL_LIB) \ INSTALLSITELIB=$(PERL_SITELIB) \ INSTALLSITEARCH=$(PERL_SITELIB) \ DESTDIR=$(PKG_INSTALL_DIR) \ From c72b4ba933f3d12fe9b44544f237ce675523cafc Mon Sep 17 00:00:00 2001 From: Marcel Denia Date: Sat, 19 Jul 2014 05:15:03 +0200 Subject: [PATCH 04/15] lang/perl: Update paths in perlmod.mk Signed-off-by: Marcel Denia --- lang/perl/perlmod.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lang/perl/perlmod.mk b/lang/perl/perlmod.mk index d424aa2b5d..b4316ae6d9 100644 --- a/lang/perl/perlmod.mk +++ b/lang/perl/perlmod.mk @@ -2,10 +2,11 @@ # # Build environment -PERL_CMD := $(STAGING_DIR)/usr/bin/perl +HOST_PERL_PREFIX:=$(STAGING_DIR_HOST)/usr +PERL_CMD:=$(STAGING_DIR_HOST)/usr/bin/perl5.20.0 # Module install prefix -PERL_SITELIB := /usr/lib/perl5/5.20 +PERL_SITELIB:=/usr/lib/perl5/5.20 define perlmod/Configure (cd $(PKG_BUILD_DIR); \ From cc07017bb6d9869fb57137825762f7942531e057 Mon Sep 17 00:00:00 2001 From: Marcel Denia Date: Sat, 19 Jul 2014 05:57:42 +0200 Subject: [PATCH 05/15] lang/perl: Override perl configuration symbols for cross-compile Signed-off-by: Marcel Denia --- lang/perl/perlmod.mk | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/lang/perl/perlmod.mk b/lang/perl/perlmod.mk index b4316ae6d9..4b2a0f4b7b 100644 --- a/lang/perl/perlmod.mk +++ b/lang/perl/perlmod.mk @@ -14,8 +14,48 @@ define perlmod/Configure $(2) \ $(PERL_CMD) Makefile.PL \ $(1) \ + AR=ar \ + CC=$(GNU_TARGET_NAME)-gcc \ + CCCDLFLAGS=-fPIC \ + CCDLFLAGS=-Wl,-E \ + DLEXT=so \ + DLSRC=dl_dlopen.xs \ + EXE_EXT=" " \ + FULL_AR=$(GNU_TARGET_NAME)-ar \ + LD=$(GNU_TARGET_NAME)-gcc \ + LDDLFLAGS="-shared $(TARGET_LDFLAGS)" \ + LDFLAGS=" " \ + LIBC=" " \ + LIB_EXT=.a \ + OBJ_EXT=.o \ + OSNAME=linux \ + OSVERS=2.4.30 \ + RANLIB=: \ + SITELIBEXP=" " \ + SITEARCHEXP=" " \ + SO=so \ + VENDORARCHEXP=" " \ + VENDORLIBEXP=" " \ + SITEPREFIX=/usr \ + INSTALLPRIVLIB=$(PERL_SITELIB) \ INSTALLSITELIB=$(PERL_SITELIB) \ + INSTALLVENDORLIB=" " \ + INSTALLARCHLIB=$(PERL_SITELIB) \ INSTALLSITEARCH=$(PERL_SITELIB) \ + INSTALLVENDORARCH=" " \ + INSTALLBIN=/usr/bin \ + INSTALLSITEBIN=/usr/bin \ + INSTALLVENDORBIN=" " \ + INSTALLSCRIPT=/usr/bin \ + INSTALLSITESCRIPT=/usr/bin \ + INSTALLVENDORSCRIPT=" " \ + INSTALLMAN1DIR=/usr/man/man1 \ + INSTALLSITEMAN1DIR=/usr/man/man1 \ + INSTALLVENDORMAN1DIR=" " \ + INSTALLMAN3DIR=/usr/man/man3 \ + INSTALLSITEMAN3DIR=/usr/man/man3 \ + INSTALLVENDORMAN3DIR=" " \ + LINKTYPE=dynamic \ DESTDIR=$(PKG_INSTALL_DIR) \ ); endef From ff5b5de7c58b59eee9f1250e5b5fb77108865195 Mon Sep 17 00:00:00 2001 From: Marcel Denia Date: Sat, 19 Jul 2014 05:59:16 +0200 Subject: [PATCH 06/15] lang/perl: Rename HOST_PERL_DIR to HOST_PERL_PREFIX Signed-off-by: Marcel Denia --- lang/perl/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lang/perl/Makefile b/lang/perl/Makefile index 4fdf30583d..32f89a7108 100644 --- a/lang/perl/Makefile +++ b/lang/perl/Makefile @@ -55,15 +55,15 @@ define Package/perl/description and is widely used to program web applications of all needs. endef -HOST_PERL_DIR:=$(STAGING_DIR_HOST)/usr +HOST_PERL_PREFIX:=$(STAGING_DIR_HOST)/usr define Host/Configure - ( cd $(HOST_BUILD_DIR); ./Configure -der -Uusedl -Dprefix=$(HOST_PERL_DIR) ) + ( cd $(HOST_BUILD_DIR); ./Configure -der -Uusedl -Dprefix=$(HOST_PERL_PREFIX) ) endef define Host/Install ( cd $(HOST_BUILD_DIR); ./miniperl installperl ) #--destdir=$(STAGING_DIR_HOST) - $(CP) $(HOST_BUILD_DIR)/generate_uudmap $(HOST_PERL_DIR)/bin/ + $(CP) $(HOST_BUILD_DIR)/generate_uudmap $(HOST_PERL_PREFIX)/bin/ endef define Build/Configure @@ -79,8 +79,8 @@ define Build/Configure -e 's!%%EXTRA_PERLLIBS%%!$(EXTRA_LIBS:%=-l%)!g' \ -e 's!%%EXTRA_PERLLIBDIRS%%!$(EXTRA_LIBDIRS:%=-L%)!g' \ -e 's!%%IPV6%%!$(if $($(CONFIG_IPV6)),define,undef)!g' \ - -e 's!%%HOSTMINIPERL%%!$(HOST_PERL_DIR)/bin/perl!g' \ - -e 's!%%HOSTGENERATE%%!$(HOST_PERL_DIR)/bin/generate_uudmap!g' \ + -e 's!%%HOSTMINIPERL%%!$(HOST_PERL_PREFIX)/bin/perl!g' \ + -e 's!%%HOSTGENERATE%%!$(HOST_PERL_PREFIX)/bin/generate_uudmap!g' \ files/config.sh-$(patsubst i386,i486,$(ARCH)).in \ > $(PKG_BUILD_DIR)/config.sh (cd $(PKG_BUILD_DIR) && ./Configure -S) From 2bc4222ffb9b8173c2ace8588a95d15b6c9c3581 Mon Sep 17 00:00:00 2001 From: Marcel Denia Date: Sat, 19 Jul 2014 06:00:58 +0200 Subject: [PATCH 07/15] lang/perl: Clean up, add comments Signed-off-by: Marcel Denia --- lang/perl/Makefile | 18 +++++++++++------- lang/perl/perlmod.mk | 6 +++++- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/lang/perl/Makefile b/lang/perl/Makefile index 32f89a7108..cb4246f69e 100644 --- a/lang/perl/Makefile +++ b/lang/perl/Makefile @@ -26,20 +26,23 @@ PKG_LICENSE:=GPLv1 ARTISTIC PKG_LICENSE_FILES:=Copying Artistic README PKG_MAINTAINER:=Marcel Denia +# Build settings PKG_BUILD_DIR:=$(BUILD_DIR)/perl/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL:=1 PKG_BUILD_DEPENDS:=perl/host PKG_BUILD_PARALLEL:=1 HOST_BUILD_PARALLEL:=1 +# Variables used during configuration/build +HOST_PERL_PREFIX:=$(STAGING_DIR_HOST)/usr +ifneq ($(CONFIG_USE_EGLIBC),) + EXTRA_LIBS:=bsd + EXTRA_LIBDIRS:=$(STAGING_DIR)/lib +endif + include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk -ifneq ($(CONFIG_USE_EGLIBC),) -EXTRA_LIBS:=bsd -EXTRA_LIBDIRS:=$(STAGING_DIR)/lib -endif - define Package/perl SUBMENU:=Perl SECTION:=lang @@ -55,17 +58,17 @@ define Package/perl/description and is widely used to program web applications of all needs. endef -HOST_PERL_PREFIX:=$(STAGING_DIR_HOST)/usr +# Static host perl define Host/Configure ( cd $(HOST_BUILD_DIR); ./Configure -der -Uusedl -Dprefix=$(HOST_PERL_PREFIX) ) endef define Host/Install ( cd $(HOST_BUILD_DIR); ./miniperl installperl ) - #--destdir=$(STAGING_DIR_HOST) $(CP) $(HOST_BUILD_DIR)/generate_uudmap $(HOST_PERL_PREFIX)/bin/ endef +# Target perl define Build/Configure sed \ -e 's!%%CC%%!$(TARGET_CC)!g' \ @@ -97,6 +100,7 @@ define Package/perl/install ln -nsf perl$(PKG_VERSION) $(1)/usr/bin/perl endef + $(eval $(call RequireCommand,rsync, \ $(PKG_NAME) requires rsync installed on the host-system. \ )) diff --git a/lang/perl/perlmod.mk b/lang/perl/perlmod.mk index 4b2a0f4b7b..ab2f4fedaa 100644 --- a/lang/perl/perlmod.mk +++ b/lang/perl/perlmod.mk @@ -3,6 +3,10 @@ # Build environment HOST_PERL_PREFIX:=$(STAGING_DIR_HOST)/usr +ifneq ($(CONFIG_USE_EGLIBC),) + EXTRA_LIBS:=bsd + EXTRA_LIBDIRS:=$(STAGING_DIR)/lib +endif PERL_CMD:=$(STAGING_DIR_HOST)/usr/bin/perl5.20.0 # Module install prefix @@ -24,7 +28,7 @@ define perlmod/Configure FULL_AR=$(GNU_TARGET_NAME)-ar \ LD=$(GNU_TARGET_NAME)-gcc \ LDDLFLAGS="-shared $(TARGET_LDFLAGS)" \ - LDFLAGS=" " \ + LDFLAGS="$(EXTRA_LIBDIRS:%=-L%) $(EXTRA_LIBS:%=-l%) " \ LIBC=" " \ LIB_EXT=.a \ OBJ_EXT=.o \ From 62b042909dfe6f7d22eabc4ee81cb219cbe30f19 Mon Sep 17 00:00:00 2001 From: Marcel Denia Date: Sat, 19 Jul 2014 08:17:52 +0200 Subject: [PATCH 08/15] lang/perl: Build relocatable host perl Signed-off-by: Marcel Denia --- lang/perl/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/perl/Makefile b/lang/perl/Makefile index cb4246f69e..bf34ff1aa1 100644 --- a/lang/perl/Makefile +++ b/lang/perl/Makefile @@ -60,7 +60,7 @@ endef # Static host perl define Host/Configure - ( cd $(HOST_BUILD_DIR); ./Configure -der -Uusedl -Dprefix=$(HOST_PERL_PREFIX) ) + ( cd $(HOST_BUILD_DIR); ./Configure -der -Uusedl -Duserelocatableinc -Dprefix=$(HOST_PERL_PREFIX) ) endef define Host/Install From 0c2bf00787e6cc0cd96d1dbc0b538c6142b87b6d Mon Sep 17 00:00:00 2001 From: Marcel Denia Date: Sat, 19 Jul 2014 08:26:06 +0200 Subject: [PATCH 09/15] lang/perl: Set archlib symbol in arm configuration Signed-off-by: Marcel Denia --- lang/perl/files/config.sh-arm.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/perl/files/config.sh-arm.in b/lang/perl/files/config.sh-arm.in index c45f22e2f1..a7c197d0a1 100644 --- a/lang/perl/files/config.sh-arm.in +++ b/lang/perl/files/config.sh-arm.in @@ -36,8 +36,6 @@ api_subversion='0' ar='ar' -archlib='' -archlibexp='' archname64='' archname='arm-linux-uclibc' archobjs='' @@ -1151,6 +1149,8 @@ installsitelib='/usr/lib/perl5/5.20' nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version' privlib='/usr/lib/perl5/5.20' privlibexp='/usr/lib/perl5/5.20' +archlib='/usr/lib/perl5/5.20' +archlibexp='/usr/lib/perl5/5.20' version='5.20.0' version_patchlevel_string='version 20 subversion 0' PERL_VERSION=20 From 08473ed3687aa720765669d5680096575c8f10b3 Mon Sep 17 00:00:00 2001 From: Marcel Denia Date: Sat, 19 Jul 2014 08:26:06 +0200 Subject: [PATCH 10/15] lang/perl: Set archlib symbol in armeb configuration Signed-off-by: Marcel Denia --- lang/perl/files/config.sh-armeb.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/perl/files/config.sh-armeb.in b/lang/perl/files/config.sh-armeb.in index 18b4209668..e56d51f36c 100644 --- a/lang/perl/files/config.sh-armeb.in +++ b/lang/perl/files/config.sh-armeb.in @@ -36,8 +36,6 @@ api_subversion='0' ar='ar' -archlib='' -archlibexp='' archname64='' archname='armeb-linux-uclibc' archobjs='' @@ -1151,6 +1149,8 @@ installsitelib='/usr/lib/perl5/5.20' nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version' privlib='/usr/lib/perl5/5.20' privlibexp='/usr/lib/perl5/5.20' +archlib='/usr/lib/perl5/5.20' +archlibexp='/usr/lib/perl5/5.20' version='5.20.0' version_patchlevel_string='version 20 subversion 0' PERL_VERSION=20 From 1179931a308078343b32ebd73a0227e864d60840 Mon Sep 17 00:00:00 2001 From: Marcel Denia Date: Sat, 19 Jul 2014 08:26:07 +0200 Subject: [PATCH 11/15] lang/perl: Set archlib symbol in avr32 configuration Signed-off-by: Marcel Denia --- lang/perl/files/config.sh-avr32.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/perl/files/config.sh-avr32.in b/lang/perl/files/config.sh-avr32.in index 7704c9ee94..eb272e8e8a 100644 --- a/lang/perl/files/config.sh-avr32.in +++ b/lang/perl/files/config.sh-avr32.in @@ -36,8 +36,6 @@ api_subversion='0' ar='ar' -archlib='' -archlibexp='' archname64='' archname='avr32-linux-uclibc' archobjs='' @@ -1153,6 +1151,8 @@ installsitelib='/usr/lib/perl5/5.20' nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version' privlib='/usr/lib/perl5/5.20' privlibexp='/usr/lib/perl5/5.20' +archlib='/usr/lib/perl5/5.20' +archlibexp='/usr/lib/perl5/5.20' version='5.20.0' version_patchlevel_string='version 20 subversion 0' PERL_VERSION=20 From a447c9b8a5ab52724ce0b9cf68ecda5d9d07e7b1 Mon Sep 17 00:00:00 2001 From: Marcel Denia Date: Sat, 19 Jul 2014 08:26:07 +0200 Subject: [PATCH 12/15] lang/perl: Set archlib symbol in i486 configuration Signed-off-by: Marcel Denia --- lang/perl/files/config.sh-i486.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/perl/files/config.sh-i486.in b/lang/perl/files/config.sh-i486.in index 82230533ed..799e711bdf 100644 --- a/lang/perl/files/config.sh-i486.in +++ b/lang/perl/files/config.sh-i486.in @@ -34,8 +34,6 @@ aphostname='/bin/hostname' api_revision='5' api_subversion='0' ar='ar' -archlib='' -archlibexp='' archname64='' archname='i386-linux-uclibc' archobjs='' @@ -1136,6 +1134,8 @@ installsitelib='/usr/lib/perl5/5.20' nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version' privlib='/usr/lib/perl5/5.20' privlibexp='/usr/lib/perl5/5.20' +archlib='/usr/lib/perl5/5.20' +archlibexp='/usr/lib/perl5/5.20' version='5.20.0' version_patchlevel_string='version 20 subversion 0' PERL_VERSION=20 From 249eed6625490db5dc7529228265d008ab11c8b5 Mon Sep 17 00:00:00 2001 From: Marcel Denia Date: Sat, 19 Jul 2014 08:26:07 +0200 Subject: [PATCH 13/15] lang/perl: Set archlib symbol in mips configuration Signed-off-by: Marcel Denia --- lang/perl/files/config.sh-mips.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/perl/files/config.sh-mips.in b/lang/perl/files/config.sh-mips.in index 8873bfe28f..bb6d2fc9c3 100644 --- a/lang/perl/files/config.sh-mips.in +++ b/lang/perl/files/config.sh-mips.in @@ -36,8 +36,6 @@ api_subversion='0' ar='ar' -archlib='' -archlibexp='' archname64='' archname='mips-linux-uclibc' archobjs='' @@ -1151,6 +1149,8 @@ installsitelib='/usr/lib/perl5/5.20' nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version' privlib='/usr/lib/perl5/5.20' privlibexp='/usr/lib/perl5/5.20' +archlib='/usr/lib/perl5/5.20' +archlibexp='/usr/lib/perl5/5.20' version='5.20.0' version_patchlevel_string='version 20 subversion 0' PERL_VERSION=20 From c902e36c803cdbc39d4d4ebab4c83f7fdf227dfb Mon Sep 17 00:00:00 2001 From: Marcel Denia Date: Sat, 19 Jul 2014 08:26:07 +0200 Subject: [PATCH 14/15] lang/perl: Set archlib symbol in powerpc configuration Signed-off-by: Marcel Denia --- lang/perl/files/config.sh-powerpc.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lang/perl/files/config.sh-powerpc.in b/lang/perl/files/config.sh-powerpc.in index fbf32aeda8..855b81263d 100644 --- a/lang/perl/files/config.sh-powerpc.in +++ b/lang/perl/files/config.sh-powerpc.in @@ -36,8 +36,6 @@ api_subversion='0' ar='ar' -archlib='' -archlibexp='' archname64='' archname='powerpc-linux-uclibc' archobjs='' @@ -1151,6 +1149,8 @@ installsitelib='/usr/lib/perl5/5.20' nonxs_ext='Archive/Tar Attribute/Handlers AutoLoader B/Debug CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno Exporter ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/Miniperl ExtUtils/ParseXS File/Fetch File/Find File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Socket/IP IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata NEXT Net/Ping Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings experimental if lib libnet parent perlfaq podlators version' privlib='/usr/lib/perl5/5.20' privlibexp='/usr/lib/perl5/5.20' +archlib='/usr/lib/perl5/5.20' +archlibexp='/usr/lib/perl5/5.20' version='5.20.0' version_patchlevel_string='version 20 subversion 0' PERL_VERSION=20 From 6dcc322af5082274827ad4306e9b277a2ed0d3b4 Mon Sep 17 00:00:00 2001 From: Marcel Denia Date: Sat, 19 Jul 2014 08:27:42 +0200 Subject: [PATCH 15/15] lang/perl: Bump PKG_RELEASE Signed-off-by: Marcel Denia --- lang/perl/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/perl/Makefile b/lang/perl/Makefile index bf34ff1aa1..c9ca0818d8 100644 --- a/lang/perl/Makefile +++ b/lang/perl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl PKG_VERSION:=5.20.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MD5SUM:=406ec049ebe3afcc80d9c76ec78ca4f8 PKG_SOURCE_URL:=ftp://ftp.cpan.org/pub/CPAN/src/5.0 \