perl parallel build fix - corrected

PATCH Applied Nitin A Kamble 2 participants 3 messages Mar 11, 2011

lore

Share & tools

lore

Nitin A Kamble

author

2011-03-11 20:22 UTC #0 lore raw

cover perl parallel build fix - corrected

From: Nitin A Kamble <[email protected]>

I missed rebasing an existing perl patch which gets affected by the parallel build fix patches. It is included in this request.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: nitin/misc
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/misc

Thanks,
Nitin A Kamble <[email protected]>
---

Nitin A Kamble (1):
perl: another set of parallel build fixes

 .../perl/perl-5.12.2/Makefile.SH.patch             |   44 +-
 .../perl/perl-5.12.2/parallel_build_fix_4.patch    |   55 +++
 .../perl/perl-5.12.2/parallel_build_fix_5.patch    |  428 ++++++++++++++++++++
 .../perl/perl-5.12.2/parallel_build_fix_6.patch    |  156 +++++++
 meta/recipes-devtools/perl/perl-native_5.12.2.bb   |    5 +-
 meta/recipes-devtools/perl/perl_5.12.2.bb          |    5 +-
 6 files changed, 669 insertions(+), 24 deletions(-)
 create mode 100644 meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_4.patch
 create mode 100644 meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_5.patch
 create mode 100644 meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_6.patch

Signature · 1 line

1.7.3.4

Nitin A Kamble

author

2011-03-11 20:22 UTC #1 lore raw

PATCH 1/1 perl: another set of parallel build fixes

From: Nitin A Kamble <[email protected]>

[YOCTO #784]

Imported more commits from the perl upstream tree

Signed-off-by Nitin A Kamble <[email protected]>

---
 .../perl/perl-5.12.2/Makefile.SH.patch             |   44 +-
 .../perl/perl-5.12.2/parallel_build_fix_4.patch    |   55 +++
 .../perl/perl-5.12.2/parallel_build_fix_5.patch    |  428 ++++++++++++++++++++
 .../perl/perl-5.12.2/parallel_build_fix_6.patch    |  156 +++++++
 meta/recipes-devtools/perl/perl-native_5.12.2.bb   |    5 +-
 meta/recipes-devtools/perl/perl_5.12.2.bb          |    5 +-
 6 files changed, 669 insertions(+), 24 deletions(-)
 create mode 100644 meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_4.patch
 create mode 100644 meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_5.patch
 create mode 100644 meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_6.patch

meta/recipes-devtools/perl/perl-5.12.2/Makefile.SH.patch +22 ~~-22~~

index 103fe97..39e5fee 100644
@@ -166,12 +166,12 @@ Index: perl-5.12.2/Makefile.SH
  	$(MINIPERL) $(Icwd) mkppport
  
  !NO!SUBS!
-@@ -970,30 +979,30 @@ esac
+@@ -970,29 +979,29 @@ esac
  $spitshell >>$Makefile <<'!NO!SUBS!'
  
  .PHONY: preplibrary
--preplibrary: $(MINIPERL_EXE) $(CONFIGPM) lib/re.pm $(PREPLIBRARY_LIBPERL)
-+preplibrary: $(CONFIGPM) lib/re.pm $(PREPLIBRARY_LIBPERL)
+-preplibrary: $(MINIPERL_EXE) $(CONFIGPM) $(PREPLIBRARY_LIBPERL)
++preplibrary: $(CONFIGPM) $(PREPLIBRARY_LIBPERL)
  
  $(CONFIGPM_FROM_CONFIG_SH): $(CONFIGPOD)

@@ -183,10 +183,6 @@ Index: perl-5.12.2/Makefile.SH
 +lib/ExtUtils/Miniperl.pm: miniperlmain.c minimod.pl $(CONFIGPM)
  	$(MINIPERL) minimod.pl > lib/ExtUtils/Miniperl.pm
  
- lib/re.pm: ext/re/re.pm
- 	@-rm -f $@
- 	cp ext/re/re.pm lib/re.pm
- 
 -$(plextract):	$(MINIPERL_EXE) $(CONFIGPM) x2p/s2p $(dynamic_ext)
 +$(plextract):	$(CONFIGPM) x2p/s2p $(dynamic_ext)
  	@-rm -f $@

@@ -196,6 +192,10 @@ Index: perl-5.12.2/Makefile.SH
 +x2p/s2p: $(CONFIGPM) $(dynamic_ext) x2p/s2p.PL
  	cd x2p; $(LDLIBPTH) $(MAKE) s2p
  
+-lib/buildcustomize.pl: $(MINIPERL_EXE) write_buildcustomize.pl
++lib/buildcustomize.pl: write_buildcustomize.pl
+ 	$(MINIPERL) write_buildcustomize.pl >lib/buildcustomize.pl
+ 
  unidatafiles $(unidatafiles) pod/perluniprops.pod: uni.data
  
 -uni.data: $(MINIPERL_EXE) $(CONFIGPM) lib/unicore/mktables $(nonxs_ext)

@@ -203,7 +203,7 @@ Index: perl-5.12.2/Makefile.SH
  	$(MINIPERL) $(Icwd) lib/unicore/mktables -C lib/unicore -P pod -maketest -makelist -p
  #	Commented out so always runs, mktables looks at far more files than we
  #	can in this makefile to decide if needs to run or not
-@@ -1002,21 +1011,21 @@ uni.data: $(MINIPERL_EXE) $(CONFIGPM) li
+@@ -1001,21 +1010,21 @@ uni.data: $(MINIPERL_EXE) $(CONFIGPM) li
  # $(PERL_EXE) and ext because buildtoc uses Text::Wrap uses re
  # But also this ensures that all extensions are built before we try to scan
  # them, which picks up Devel::PPPort's documentation.

@@ -230,7 +230,7 @@ Index: perl-5.12.2/Makefile.SH
  	-@test ! -f extra.pods || rm -f `cat extra.pods`
  	-@rm -f extra.pods
  	-@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \
-@@ -1059,11 +1068,7 @@ no-install:
+@@ -1058,11 +1067,7 @@ no-install:
  INSTALL_DEPENDENCE = all
  
  install.perl:	$(INSTALL_DEPENDENCE) installperl

@@ -243,28 +243,28 @@ Index: perl-5.12.2/Makefile.SH
  
  # XXX Experimental. Hardwired values, but useful for testing.
  # Eventually Configure could ask for some of these values.
-@@ -1160,16 +1165,16 @@ manicheck:	FORCE
+@@ -1159,16 +1164,16 @@ manicheck:	FORCE
  #
  # DynaLoader may be needed for extensions that use Makefile.PL.
  
--$(DYNALOADER):	$(MINIPERL_EXE) preplibrary FORCE $(nonxs_ext)
-+$(DYNALOADER):	preplibrary FORCE $(nonxs_ext)
+-$(DYNALOADER):	$(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE $(nonxs_ext)
++$(DYNALOADER):	lib/buildcustomize.pl preplibrary FORCE $(nonxs_ext)
  	$(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS)
  
--d_dummy $(dynamic_ext):	$(MINIPERL_EXE) preplibrary makeppport $(DYNALOADER) FORCE $(PERLEXPORT)
-+d_dummy $(dynamic_ext):	preplibrary makeppport $(DYNALOADER) FORCE $(PERLEXPORT)
+-d_dummy $(dynamic_ext):	$(MINIPERL_EXE) lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE $(PERLEXPORT)
++d_dummy $(dynamic_ext):	lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE $(PERLEXPORT)
  	$(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic
  
--s_dummy $(static_ext):	$(MINIPERL_EXE) preplibrary makeppport $(DYNALOADER) FORCE
-+s_dummy $(static_ext):	preplibrary makeppport $(DYNALOADER) FORCE
+-s_dummy $(static_ext):	$(MINIPERL_EXE) lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE
++s_dummy $(static_ext):	lib/buildcustomize.pl preplibrary makeppport $(DYNALOADER) FORCE
  	$(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=static $(STATIC_LDFLAGS)
  
--n_dummy $(nonxs_ext):	$(MINIPERL_EXE) preplibrary FORCE
-+n_dummy $(nonxs_ext):	preplibrary FORCE
+-n_dummy $(nonxs_ext):	$(MINIPERL_EXE) lib/buildcustomize.pl preplibrary FORCE
++n_dummy $(nonxs_ext):	lib/buildcustomize.pl preplibrary FORCE
  	$(MINIPERL) make_ext.pl $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
  !NO!SUBS!
  
-@@ -1367,10 +1372,10 @@ _test:
+@@ -1366,10 +1371,10 @@ _test:
  
  test_prep_pre: preplibrary utilities $(nonxs_ext)

@@ -277,12 +277,12 @@ Index: perl-5.12.2/Makefile.SH
  	$(MINIPERL) make_ext.pl $(dynamic_ext_re) MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic
  	cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE))
  
-@@ -1461,7 +1466,7 @@ minitest.prep:
+@@ -1460,7 +1465,7 @@ minitest.prep:
  
  # Can't depend on lib/Config.pm because that might be where miniperl
  # is crashing.
--minitest: $(MINIPERL_EXE) lib/re.pm minitest.prep
-+minitest: lib/re.pm minitest.prep
+-minitest: $(MINIPERL_EXE) minitest.prep
++minitest: minitest.prep
  	- cd t && (rm -f $(PERL_EXE); $(LNS) ../$(MINIPERL_EXE) $(PERL_EXE)) \
  		&& $(RUN_PERL) TEST -minitest base/*.t comp/*.t cmd/*.t run/*.t io/*.t re/*.t op/*.t uni/*.t </dev/tty

meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_4.patch new file +55 -0

55 lines not on this page · raw message

meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_5.patch new file +428 -0

428 lines not on this page · raw message

meta/recipes-devtools/perl/perl-5.12.2/parallel_build_fix_6.patch new file +156 -0

156 lines not on this page · raw message

meta/recipes-devtools/perl/perl-native_5.12.2.bb +4 -1

index cd21e9e..9af7b06 100644
@@ -4,7 +4,7 @@ SECTION = "libs"
 LICENSE = "Artistic|GPL"
 LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
 		    file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"
-PR = "r6"
+PR = "r7"
 
 LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
                     file://Artistic;md5=f921793d03cc6d63ec4b15e9be8fd3f8"

@@ -15,6 +15,9 @@ SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
            file://parallel_build_fix_1.patch \
            file://parallel_build_fix_2.patch \
            file://parallel_build_fix_3.patch \
+           file://parallel_build_fix_4.patch \
+           file://parallel_build_fix_5.patch \
+           file://parallel_build_fix_6.patch \
            file://native-nopacklist.patch;patch=1 \
            file://native-perlinc.patch;patch=1"

meta/recipes-devtools/perl/perl_5.12.2.bb +4 -1

index 18fad18..184e1e7 100644
@@ -8,7 +8,7 @@ PRIORITY = "optional"
 # We need gnugrep (for -I)
 DEPENDS = "virtual/db perl-native-${PV} grep-native"
 DEPENDS += "gdbm zlib"
-PR = "r2"
+PR = "r3"
 
 # 5.10.1 has Module::Build built-in
 PROVIDES += "libmodule-build-perl"

@@ -21,6 +21,9 @@ SRC_URI = "ftp://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
         file://parallel_build_fix_1.patch \
         file://parallel_build_fix_2.patch \
         file://parallel_build_fix_3.patch \
+        file://parallel_build_fix_4.patch \
+        file://parallel_build_fix_5.patch \
+        file://parallel_build_fix_6.patch \
         file://Makefile.SH.patch;patch=1 \
         file://installperl.patch;patch=1 \
         file://perl-dynloader.patch;patch=1 \

Signature · 1 line

1.7.3.4

Richard Purdie

Applied

2011-03-11 23:08 UTC #2 lore raw

In reply to Nitin A Kamble

Quoted 10 lines · Nitin A Kamble

From: Nitin A Kamble <[email protected]>
I missed rebasing an existing perl patch which gets affected by the parallel build fix patches. It is included in this request.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: nitin/misc
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/misc
Thanks,
Nitin A Kamble <[email protected]>

Merged to master, thanks.

Richard