Browse Source

Merge pull request #123 from Naoir/perl

perl: More bugfixes, correct PKG_LICENSE
lilik-openwrt-22.03
sbyx 10 years ago
parent
commit
6eb2ac4815
6 changed files with 28 additions and 18 deletions
  1. +12
    -4
      lang/perl/Makefile
  2. +4
    -4
      lang/perl/files/config.sh-arm.in
  3. +4
    -4
      lang/perl/files/config.sh-armeb.in
  4. +3
    -3
      lang/perl/files/config.sh-x86_64.in
  5. +1
    -1
      lang/perl/perlbase.mk
  6. +4
    -2
      lang/perl/perlmod.mk

+ 12
- 4
lang/perl/Makefile View File

@ -9,8 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=perl PKG_NAME:=perl
PKG_VERSION:=5.20.0 PKG_VERSION:=5.20.0
PKG_RELEASE:=3
PKG_MD5SUM:=406ec049ebe3afcc80d9c76ec78ca4f8
PKG_RELEASE:=4
PKG_SOURCE_URL:=ftp://ftp.cpan.org/pub/CPAN/src/5.0 \ PKG_SOURCE_URL:=ftp://ftp.cpan.org/pub/CPAN/src/5.0 \
http://www.cpan.org/src/5.0/perl-5.20.0.tar.gz \ http://www.cpan.org/src/5.0/perl-5.20.0.tar.gz \
@ -21,8 +20,9 @@ PKG_SOURCE_URL:=ftp://ftp.cpan.org/pub/CPAN/src/5.0 \
ftp://ftp.funet.fi/pub/languages/perl/CPAN/src/5.0 \ ftp://ftp.funet.fi/pub/languages/perl/CPAN/src/5.0 \
http://ftp.funet.fi/pub/languages/perl/CPAN/src/5.0 http://ftp.funet.fi/pub/languages/perl/CPAN/src/5.0
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_MD5SUM:=406ec049ebe3afcc80d9c76ec78ca4f8
PKG_LICENSE:=GPLv1 ARTISTIC
PKG_LICENSE:=GPLv1+ ARTISTIC
PKG_LICENSE_FILES:=Copying Artistic README PKG_LICENSE_FILES:=Copying Artistic README
PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net> PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>
@ -39,6 +39,9 @@ ifneq ($(CONFIG_USE_EGLIBC),)
EXTRA_LIBS:=bsd EXTRA_LIBS:=bsd
EXTRA_LIBDIRS:=$(STAGING_DIR)/lib EXTRA_LIBDIRS:=$(STAGING_DIR)/lib
endif endif
# Filter -g3, it will break Compress-Raw-Zlib
TARGET_CFLAGS_PERL:=$(patsubst -g3,-g,$(TARGET_CFLAGS))
TARGET_CPPFLAGS_PERL:=$(patsubst -g3,-g,$(TARGET_CPPFLAGS))
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
@ -72,7 +75,7 @@ endef
define Build/Configure define Build/Configure
sed \ sed \
-e 's!%%CC%%!$(TARGET_CC)!g' \ -e 's!%%CC%%!$(TARGET_CC)!g' \
-e 's!%%CFLAGS%%!$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)!g' \
-e 's!%%CFLAGS%%!$(TARGET_CFLAGS_PERL) $(TARGET_CPPFLAGS_PERL)!g' \
-e 's!%%CPP%%!$(TARGET_CROSS)gcc -E!g' \ -e 's!%%CPP%%!$(TARGET_CROSS)gcc -E!g' \
-e 's!%%AR%%!$(TARGET_CROSS)ar!g' \ -e 's!%%AR%%!$(TARGET_CROSS)ar!g' \
-e 's!%%LD%%!$(TARGET_CROSS)gcc!g' \ -e 's!%%LD%%!$(TARGET_CROSS)gcc!g' \
@ -94,6 +97,11 @@ define Build/Compile
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)
endef endef
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/lib/perl5/5.20/CORE
$(CP) $(PKG_INSTALL_DIR)/usr/lib/perl5/5.20/CORE/*.h $(1)/usr/lib/perl5/5.20/CORE/
endef
define Package/perl/install define Package/perl/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/perl$(PKG_VERSION) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/perl$(PKG_VERSION) $(1)/usr/bin


+ 4
- 4
lang/perl/files/config.sh-arm.in View File

@ -601,13 +601,13 @@ html1direxp=''
html3dir=' ' html3dir=' '
html3direxp='' html3direxp=''
i16size='2' i16size='2'
i16type='short'
i16type='signed short'
i32size='4' i32size='4'
i32type='long'
i32type='signed long'
i64size='8' i64size='8'
i64type='long long'
i64type='signed long long'
i8size='1' i8size='1'
i8type='char'
i8type='signed char'
i_arpainet='define' i_arpainet='define'
i_bsdioctl='' i_bsdioctl=''
i_crypt='define' i_crypt='define'


+ 4
- 4
lang/perl/files/config.sh-armeb.in View File

@ -601,13 +601,13 @@ html1direxp=''
html3dir=' ' html3dir=' '
html3direxp='' html3direxp=''
i16size='2' i16size='2'
i16type='short'
i16type='signed short'
i32size='4' i32size='4'
i32type='long'
i32type='signed long'
i64size='8' i64size='8'
i64type='long long'
i64type='signed long long'
i8size='1' i8size='1'
i8type='char'
i8type='signed char'
i_arpainet='define' i_arpainet='define'
i_bsdioctl='' i_bsdioctl=''
i_crypt='define' i_crypt='define'


+ 3
- 3
lang/perl/files/config.sh-x86_64.in View File

@ -547,7 +547,7 @@ fflushall='undef'
find='' find=''
firstmakefile='makefile' firstmakefile='makefile'
flex='' flex=''
fpossize='20'
fpossize='16'
fpostype='fpos_t' fpostype='fpos_t'
freetype='void' freetype='void'
from=':' from=':'
@ -604,7 +604,7 @@ i32type='int'
i64size='8' i64size='8'
i64type='long' i64type='long'
i8size='1' i8size='1'
i8type='char'
i8type='signed char'
i_arpainet='define' i_arpainet='define'
i_bsdioctl='' i_bsdioctl=''
i_crypt='define' i_crypt='define'
@ -943,7 +943,7 @@ subversion='0'
sysman='/usr/share/man/man1' sysman='/usr/share/man/man1'
tail='' tail=''
tar='' tar=''
targetarch='i386-linux-uclibc'
targetarch='x86_64-linux-uclibc'
tbl='' tbl=''
tee='' tee=''
test='test' test='test'


+ 1
- 1
lang/perl/perlbase.mk View File

@ -458,7 +458,7 @@ TITLE:=essential perl module
endef endef
define Package/perlbase-essential/install define Package/perlbase-essential/install
$(call perlmod/Install,$(1),Carp Carp.pm Exporter Exporter.pm constant.pm lib.pm locale.pm overload.pm strict.pm subs.pm vars.pm warnings warnings.pm,)
$(call perlmod/Install,$(1),Carp Carp.pm Exporter Exporter.pm constant.pm lib.pm locale.pm overload.pm strict.pm subs.pm vars.pm warnings warnings.pm overloading.pm,)
endef endef
$(eval $(call BuildPackage,perlbase-essential)) $(eval $(call BuildPackage,perlbase-essential))


+ 4
- 2
lang/perl/perlmod.mk View File

@ -20,6 +20,7 @@ define perlmod/Configure
$(1) \ $(1) \
AR=ar \ AR=ar \
CC=$(GNU_TARGET_NAME)-gcc \ CC=$(GNU_TARGET_NAME)-gcc \
CCFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
CCCDLFLAGS=-fPIC \ CCCDLFLAGS=-fPIC \
CCDLFLAGS=-Wl,-E \ CCDLFLAGS=-Wl,-E \
DLEXT=so \ DLEXT=so \
@ -62,6 +63,7 @@ define perlmod/Configure
LINKTYPE=dynamic \ LINKTYPE=dynamic \
DESTDIR=$(PKG_INSTALL_DIR) \ DESTDIR=$(PKG_INSTALL_DIR) \
); );
sed 's!^PERL_INC = .*!PERL_INC = $(STAGING_DIR)/usr/lib/perl5/5.20/CORE/!' -i $(PKG_BUILD_DIR)/Makefile
endef endef
define perlmod/Compile define perlmod/Compile
@ -87,8 +89,8 @@ define perlmod/Install
@echo "---> Stripping modules in: $(strip $(1))$(PERL_SITELIB)" @echo "---> Stripping modules in: $(strip $(1))$(PERL_SITELIB)"
find $(strip $(1))$(PERL_SITELIB) -name \*.pm -or -name \*.pl | \ find $(strip $(1))$(PERL_SITELIB) -name \*.pm -or -name \*.pl | \
xargs -r sed -i \ xargs -r sed -i \
-e '/^=\(head\|pod\|item\|over\|back\)/,/^=cut/d' \
-e '/^=\(head\|pod\|item\|over\|back\)/,$$$$d' \
-e '/^=\(head\|pod\|item\|over\|back\|encoding\)/,/^=cut/d' \
-e '/^=\(head\|pod\|item\|over\|back\|encoding\)/,$$$$d' \
-e '/^#$$$$/d' \ -e '/^#$$$$/d' \
-e '/^#[^!"'"'"']/d' -e '/^#[^!"'"'"']/d'
endef endef

Loading…
Cancel
Save