From abaab88e578683dd56fbb9f57737131549b1f648 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 2 Mar 2013 00:38:58 +0000 Subject: [PATCH] microperl: remove it microperl has been deprecated by perl Signed-off-by: Francois Perrad Acked-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/Config.in | 1 - .../libxml-parser-perl/libxml-parser-perl.mk | 6 - package/microperl/Config.in | 30 ---- .../microperl-no-signal-handlers.patch | 22 --- package/microperl/microperl-uudmap.patch | 47 ------ package/microperl/microperl.mk | 156 ------------------ 6 files changed, 262 deletions(-) delete mode 100644 package/microperl/Config.in delete mode 100644 package/microperl/microperl-no-signal-handlers.patch delete mode 100644 package/microperl/microperl-uudmap.patch delete mode 100644 package/microperl/microperl.mk diff --git a/package/Config.in b/package/Config.in index 8a0250630d..6701dc61fe 100644 --- a/package/Config.in +++ b/package/Config.in @@ -316,7 +316,6 @@ menu "Perl libraries/modules" source "package/cpanminus/Config.in" endmenu endif -source "package/microperl/Config.in" source "package/php/Config.in" source "package/python/Config.in" source "package/python3/Config.in" diff --git a/package/libxml-parser-perl/libxml-parser-perl.mk b/package/libxml-parser-perl/libxml-parser-perl.mk index 996b10d6b3..4454e57c62 100644 --- a/package/libxml-parser-perl/libxml-parser-perl.mk +++ b/package/libxml-parser-perl/libxml-parser-perl.mk @@ -10,12 +10,6 @@ LIBXML_PARSER_PERL_SITE = http://www.cpan.org/modules/by-module/XML/ LIBXML_PARSER_PERL_DEPENDENCIES = expat -ifeq ($(BR2_PACKAGE_MICROPERL),y) -# microperl builds host-microperl, so ensure we build after that to build -# against host-microperl instead of the system perl -LIBXML_PARSER_PERL_DEPENDENCIES += microperl -endif - define HOST_LIBXML_PARSER_PERL_CONFIGURE_CMDS (cd $(@D) ; \ $(HOST_CONFIGURE_OPTS) perl Makefile.PL \ diff --git a/package/microperl/Config.in b/package/microperl/Config.in deleted file mode 100644 index 19d104a698..0000000000 --- a/package/microperl/Config.in +++ /dev/null @@ -1,30 +0,0 @@ -config BR2_PACKAGE_MICROPERL - bool "microperl" - # needs fork() - depends on BR2_USE_MMU - depends on BR2_DEPRECATED - help - Perl without operating-specific functions such as readdir. - -if BR2_PACKAGE_MICROPERL - -config BR2_PACKAGE_MICROPERL_MODULES - string "additional modules" - help - List of space-separated microperl modules to copy to the rootfs. - - Examples: warnings.pm Getopt/Std.pm Time::Local - - Module dependencies are not automatic so check your needs. - You can't use XS modules like IO. - -menu "module bundles" - -config BR2_PACKAGE_MICROPERL_BUNDLE_CGI - bool "CGI" - help - Copy required modules to do CGI scripting. - -endmenu - -endif diff --git a/package/microperl/microperl-no-signal-handlers.patch b/package/microperl/microperl-no-signal-handlers.patch deleted file mode 100644 index 3c9aa418ea..0000000000 --- a/package/microperl/microperl-no-signal-handlers.patch +++ /dev/null @@ -1,22 +0,0 @@ -Backport of http://perl5.git.perl.org/perl.git/commitdiff/01d65469392dfc0a?hp=a82b5f080d91ffe184d8ac4795ac71e72e612c2f - -Signed-off-by: Gustavo Zacarias - -diff -Nura perl-5.12.3/miniperlmain.c perl-5.12.3-nosig/miniperlmain.c ---- perl-5.12.3/miniperlmain.c 2011-01-09 17:20:57.000000000 -0300 -+++ perl-5.12.3-nosig/miniperlmain.c 2011-04-14 10:16:53.564639438 -0300 -@@ -116,12 +116,14 @@ - if (!exitstatus) - perl_run(my_perl); - -+#ifndef PERL_MICRO - /* Unregister our signal handler before destroying my_perl */ - for (i = 0; PL_sig_name[i]; i++) { - if (rsignal_state(PL_sig_num[i]) == (Sighandler_t) PL_csighandlerp) { - rsignal(PL_sig_num[i], (Sighandler_t) SIG_DFL); - } - } -+#endif - - exitstatus = perl_destruct(my_perl); - diff --git a/package/microperl/microperl-uudmap.patch b/package/microperl/microperl-uudmap.patch deleted file mode 100644 index c72f9c9a14..0000000000 --- a/package/microperl/microperl-uudmap.patch +++ /dev/null @@ -1,47 +0,0 @@ -From a82b5f080d91ffe184d8ac4795ac71e72e612c2f Mon Sep 17 00:00:00 2001 -From: David Leadbeater -Date: Mon, 7 Mar 2011 18:40:55 +0000 -Subject: [PATCH] microperl: Update generate_uudmap in Makefile.micro - -Makefile.micro hadn't kept up with the changes for generate_uudmap, -make it match the real Makefile. ---- - Makefile.micro | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile.micro b/Makefile.micro -index 4b738f5..567d98a 100644 ---- a/Makefile.micro -+++ b/Makefile.micro -@@ -35,7 +35,7 @@ H = av.h uconfig.h cop.h cv.h embed.h embedvar.h form.h gv.h handy.h \ - HE = $(H) EXTERN.h - - clean: -- -rm -f $(O) microperl generate_uudmap$(_X) uudmap.h -+ -rm -f $(O) microperl generate_uudmap$(_X) uudmap.h bitcount.h - - distclean: clean - -@@ -74,7 +74,7 @@ udoop$(_O): $(HE) doop.c - udump$(_O): $(HE) dump.c regcomp.h regnodes.h - $(CC) $(CCFLAGS) -o $@ $(CFLAGS) dump.c - --uglobals$(_O): $(H) globals.c INTERN.h perlapi.h -+uglobals$(_O): $(H) globals.c INTERN.h perlapi.h uudmap.h bitcount.h - $(CC) $(CCFLAGS) -o $@ $(CFLAGS) globals.c - - ugv$(_O): $(HE) gv.c -@@ -173,8 +173,8 @@ uutil$(_O): $(HE) util.c - uperlapi$(_O): $(HE) perlapi.c perlapi.h - $(CC) $(CCFLAGS) -o $@ $(CFLAGS) perlapi.c - --uudmap.h: generate_uudmap$(_X) -- $(RUN) ./generate_uudmap$(_X) >uudmap.h -+uudmap.h bitcount.h: generate_uudmap$(_X) -+ $(RUN) ./generate_uudmap$(_X) uudmap.h bitcount.h - - generate_uudmap$(_O): generate_uudmap.c - $(CC) $(CCFLAGS) -o $@ $(CFLAGS) generate_uudmap.c --- -1.6.5.2.74.g610f9.dirty - diff --git a/package/microperl/microperl.mk b/package/microperl/microperl.mk deleted file mode 100644 index b2a912a094..0000000000 --- a/package/microperl/microperl.mk +++ /dev/null @@ -1,156 +0,0 @@ -############################################################# -# -# microperl -# -############################################################# - -MICROPERL_VERSION = 5.12.4 -MICROPERL_SITE = http://www.cpan.org/src/5.0 -MICROPERL_SOURCE = perl-$(MICROPERL_VERSION).tar.bz2 -MICROPERL_LICENSE = Artistic -MICROPERL_LICENSE_FILES = Artistic -MICROPERL_DEPENDENCIES = host-microperl -MICROPERL_MODS_DIR = /usr/lib/perl5/$(MICROPERL_VERSION) -MICROPERL_ARCH_DIR = $(MICROPERL_MODS_DIR)/$(GNU_TARGET_NAME) -MICROPERL_MODS = $(call qstrip,$(BR2_PACKAGE_MICROPERL_MODULES)) - -# Minimal set of modules required for 'perl -V' to work -MICROPERL_ARCH_MODS = Config.pm Config_git.pl Config_heavy.pl -MICROPERL_BASE_MODS = strict.pm - -# CGI bundle -ifeq ($(BR2_PACKAGE_MICROPERL_BUNDLE_CGI),y) -MICROPERL_MODS += constant.pm CGI CGI.pm Carp.pm Exporter.pm overload.pm \ - vars.pm warnings.pm warnings/register.pm -endif - -# Host microperl is actually full-blown perl -define HOST_MICROPERL_CONFIGURE_CMDS - cd $(@D) ; \ - ./Configure -Dcc="$(HOSTCC)" -Dprefix="$(HOST_DIR)/usr" \ - -Dloclibpth='/lib /lib64 /usr/lib /usr/lib64' -des -endef - -define HOST_MICROPERL_BUILD_CMDS - $(MAKE) -C $(@D) -endef - -define HOST_MICROPERL_INSTALL_CMDS - $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_ENDIAN),"BIG") -define MICROPERL_BIGENDIAN - $(SED) '/^byteorder=/d' $(@D)/uconfig.sh - echo "byteorder='4321'" >>$(@D)/uconfig.sh -endef -endif - -ifeq ($(BR2_LARGEFILE),y) -define MICROPERL_LARGEFILE - $(SED) '/^uselargefiles=/d' $(@D)/uconfig.sh - echo "uselargefiles='define'" >>$(@D)/uconfig.sh -endef -endif - -ifeq ($(BR2_USE_WCHAR),y) -define MICROPERL_WCHAR - $(SED) '/^d_mbstowcs=/d' -e '/^d_mbtowc=/d' -e '/^d_wcstombs=/d' \ - -e '/^d_wctomb=/d' $(@D)/uconfig.sh - echo "d_mbstowcs='define'" >>$(@D)/uconfig.sh - echo "d_mbtowc='define'" >>$(@D)/uconfig.sh - echo "d_wcstombs='define'" >>$(@D)/uconfig.sh - echo "d_wctomb='define'" >>$(@D)/uconfig.sh -endef -endif - -define MICROPERL_CONFIGURE_CMDS - $(SED) '/^archlib=/d' -e '/^archlibexp=/d' -e '/^optimize=/d' \ - -e '/^archname=/d' -e '/^d_poll=/d' -e '/^i_poll=/d' \ - -e '/^osname=/d' -e '/^u32type=/d' -e '/^d_archlib=/d' \ - -e '/^d_memset=/d' -e '/^i_fcntl=/d' -e '/^useperlio=/d' \ - -e '/^need_va_copy=/d' $(@D)/uconfig.sh - $(SED) 's/5.12/$(MICROPERL_VERSION)/' $(@D)/uconfig.sh - echo "archlib='$(MICROPERL_ARCH_DIR)'" >>$(@D)/uconfig.sh - echo "archlibexp='$(MICROPERL_ARCH_DIR)'" >>$(@D)/uconfig.sh - echo "d_archlib='define'" >>$(@D)/uconfig.sh - echo "archname='$(GNU_TARGET_NAME)'" >>$(@D)/uconfig.sh - echo "osname='linux'" >>$(@D)/uconfig.sh - echo "cc='$(TARGET_CC)'" >>$(@D)/uconfig.sh - echo "ccflags='$(TARGET_CFLAGS)'" >>$(@D)/uconfig.sh - echo "optimize='$(TARGET_CFLAGS)'" >>$(@D)/uconfig.sh - echo "usecrosscompile='define'" >>$(@D)/uconfig.sh - echo "d_memset='define'" >>$(@D)/uconfig.sh - echo "i_fcntl='define'" >>$(@D)/uconfig.sh - echo "useperlio='define'" >>$(@D)/uconfig.sh - echo "u32type='unsigned int'" >>$(@D)/uconfig.sh - echo "need_va_copy='define'" >>$(@D)/uconfig.sh - echo "d_poll='define'" >>$(@D)/uconfig.sh - echo "i_poll='define'" >>$(@D)/uconfig.sh - $(SED) 's/UNKNOWN-/Buildroot $(BR2_VERSION_FULL) /' $(@D)/patchlevel.h - $(SED) 's/local\///' $(@D)/uconfig.sh - $(MICROPERL_BIGENDIAN) - $(MICROPERL_LARGEFILE) - $(MICROPERL_WCHAR) - $(MAKE) -C $(@D) -f Makefile.micro regen_uconfig - cp -f $(@D)/uconfig.h $(@D)/config.h - cp -f $(@D)/uconfig.sh $(@D)/config.sh - echo "ccname='$(TARGET_CC)'" >>$(@D)/config.sh - echo "PERL_CONFIG_SH=true" >>$(@D)/config.sh - cd $(@D) ; $(HOST_DIR)/usr/bin/perl make_patchnum.pl ; \ - $(HOST_DIR)/usr/bin/perl configpm -endef - -define MICROPERL_BUILD_CMDS - $(MAKE) -f Makefile.micro -C $(@D) \ - CC="$(HOSTCC)" bitcount.h - $(MAKE) -f Makefile.micro -C $(@D) \ - CC="$(TARGET_CC)" OPTIMIZE="$(TARGET_CFLAGS)" -endef - -# Some extensions don't need a build run -# We try to build anyway to avoid a huge black list -# Just ignore make_ext.pl warning/errors -define MICROPERL_BUILD_EXTENSIONS - for i in $(MICROPERL_MODS); do \ - cd $(@D); ln -sf $(HOST_DIR)/usr/bin/perl miniperl; \ - PERL5LIB=$(TARGET_DIR)/$(MICROPERL_ARCH_DIR) \ - $(HOST_DIR)/usr/bin/perl make_ext.pl MAKE="$(MAKE)" --nonxs \ - `echo $$i|sed -e 's/.pm//'`; \ - done -endef - -define MICROPERL_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/microperl $(TARGET_DIR)/usr/bin/microperl - ln -sf microperl $(TARGET_DIR)/usr/bin/perl - for i in $(MICROPERL_ARCH_MODS); do \ - $(INSTALL) -m 0644 -D $(@D)/lib/$$i \ - $(TARGET_DIR)/$(MICROPERL_ARCH_DIR)/$$i; \ - done - for i in $(MICROPERL_BASE_MODS); do \ - $(INSTALL) -m 0644 -D $(@D)/lib/$$i \ - $(TARGET_DIR)/$(MICROPERL_MODS_DIR)/$$i; \ - done - $(MICROPERL_BUILD_EXTENSIONS) - for i in $(MICROPERL_MODS); do \ - j=`echo $$i|cut -d : -f 1` ; \ - if [ -d $(@D)/lib/$$j ] ; then \ - cp -af $(@D)/lib/$$j $(TARGET_DIR)/$(MICROPERL_MODS_DIR) ; \ - fi ; \ - if [ -f $(@D)/lib/$$i ] ; then \ - $(INSTALL) -m 0644 -D $(@D)/lib/$$i $(TARGET_DIR)/$(MICROPERL_MODS_DIR)/$$i; \ - fi ; \ - done - # Remove test files - find $(TARGET_DIR)/$(MICROPERL_MODS_DIR) -type f -name *.t \ - -exec rm -f {} \; -endef - -define MICROPERL_UNINSTALL_TARGET_CMDS - rm -f $(TARGET_DIR)/usr/bin/perl - rm -f $(TARGET_DIR)/usr/bin/microperl - rm -rf $(TARGET_DIR)/usr/lib/perl5 -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) -- 2.30.2