From patchwork Tue Nov 13 08:10:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 198559 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 4816C2C00AE for ; Tue, 13 Nov 2012 19:11:56 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 1128FA01D9; Tue, 13 Nov 2012 08:11:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1ikBX+0cC-q2; Tue, 13 Nov 2012 08:11:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id A6029A01E2; Tue, 13 Nov 2012 08:11:13 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id ED8DB8F753 for ; Tue, 13 Nov 2012 08:11:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id ABDD581457 for ; Tue, 13 Nov 2012 08:10:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Iw25CXwl0Cki for ; Tue, 13 Nov 2012 08:10:53 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from viper.mind.be (132.79-246-81.adsl-static.isp.belgacom.be [81.246.79.132]) by whitealder.osuosl.org (Postfix) with ESMTPS id D226E84F9B for ; Tue, 13 Nov 2012 08:10:52 +0000 (UTC) Received: from [172.16.2.6] (helo=vandecaa-laptop) by viper.mind.be with esmtp (Exim 4.69) (envelope-from ) id 1TYBa5-0006Yd-GQ; Tue, 13 Nov 2012 09:10:50 +0100 Received: from arnout by vandecaa-laptop with local (Exim 4.80) (envelope-from ) id 1TYBa4-00044i-Is; Tue, 13 Nov 2012 09:10:48 +0100 From: "Arnout Vandecappelle (Essensium/Mind)" To: buildroot@busybox.net Date: Tue, 13 Nov 2012 09:10:43 +0100 Message-Id: <1352794248-15617-1-git-send-email-arnout@mind.be> X-Mailer: git-send-email 1.7.10.4 Subject: [Buildroot] [PATCH v2 1/6] perl: remove redundant patches X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: "Arnout Vandecappelle (Essensium/Mind)" Now we are using perlcross, the patches to make perl work with qemu are redundant, so remove them. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- v2: don't remove perl-fix-Module-Build.patch [Francois Perrad] --- package/perl/perl-configure-qemu.patch | 53 -------------------------------- package/perl/perl-make-ext.patch | 24 --------------- package/perl/perl-mkppport.patch | 37 ---------------------- 3 files changed, 114 deletions(-) delete mode 100644 package/perl/perl-configure-qemu.patch delete mode 100644 package/perl/perl-make-ext.patch delete mode 100644 package/perl/perl-mkppport.patch diff --git a/package/perl/perl-configure-qemu.patch b/package/perl/perl-configure-qemu.patch deleted file mode 100644 index c2d6b92..0000000 --- a/package/perl/perl-configure-qemu.patch +++ /dev/null @@ -1,53 +0,0 @@ -Add qemu support - -see https://rt.perl.org/rt3//Public/Bug/Display.html?id=114798 - -Signed-off-by: Francois Perrad - -Index: b/Configure -=================================================================== ---- a/Configure -+++ b/Configure -@@ -2837,6 +2837,9 @@ - ;; - *) echo "Using usrinc $usrinc." >&4 ;; - esac -+ case "$targetrun" in -+ *qemu*) targethost=dummy ;; -+ esac - case "$targethost" in - '') echo "Targethost not defined." >&4; croak=y ;; - *) echo "Using targethost $targethost." >&4 -@@ -2868,7 +2871,7 @@ - case "$targetfrom" in - '') targetfrom=scp ;; - esac -- run=$run-$targetrun -+ run=$run-`basename $targetrun` - to=$to-$targetto - from=$from-$targetfrom - case "$targetdir" in -@@ -2908,6 +2911,14 @@ - $targetrun -l $targetuser $targethost "cd \$cwd && ./\$exe \$@" - EOF - ;; -+ *qemu*) -+ to=: -+ from=: -+ cat >$run <&4 - exit 1 - ;; -@@ -5048,7 +5059,7 @@ - echo " "; - echo "Checking if your compiler accepts $flag" 2>&1; - echo "int main(void) { return 0; }" > gcctest.c; --if $cc -O2 $flag -o gcctest gcctest.c 2>gcctest.out && ./gcctest; then -+if $cc -O2 $flag -o gcctest gcctest.c 2>gcctest.out && $run ./gcctest; then - echo "Yes, it does." 2>&1; - if $test -s gcctest.out ; then - echo "But your platform does not like it:"; diff --git a/package/perl/perl-make-ext.patch b/package/perl/perl-make-ext.patch deleted file mode 100644 index e0195e7..0000000 --- a/package/perl/perl-make-ext.patch +++ /dev/null @@ -1,24 +0,0 @@ -Don't use RUN with make (only for perl) - -Signed-off-by: Francois Perrad - -Index: b/make_ext.pl -=================================================================== ---- a/make_ext.pl -+++ b/make_ext.pl -@@ -458,11 +458,13 @@ - # Give makefile an opportunity to rewrite itself. - # reassure users that life goes on... - my @args = ('config', @$pass_through); -- system(@run, @make, @args) and print "@run @make @args failed, continuing anyway...\n"; -+# system(@run, @make, @args) and print "@run @make @args failed, continuing anyway...\n"; -+ system(@make, @args) and print "@make @args failed, continuing anyway...\n"; - } - my @targ = ($target, @$pass_through); - print "Making $target in $ext_dir\n@run @make @targ\n"; -- my $code = system(@run, @make, @targ); -+# my $code = system(@run, @make, @targ); -+ my $code = system(@make, @targ); - die "Unsuccessful make($ext_dir): code=$code" if $code != 0; - - chdir $return_dir || die "Cannot cd to $return_dir: $!"; diff --git a/package/perl/perl-mkppport.patch b/package/perl/perl-mkppport.patch deleted file mode 100644 index 97f27a2..0000000 --- a/package/perl/perl-mkppport.patch +++ /dev/null @@ -1,37 +0,0 @@ -Add RUN - -Signed-off-by: Francois Perrad - -Index: b/mkppport -=================================================================== ---- a/mkppport -+++ b/mkppport -@@ -1,6 +1,7 @@ - use strict; - use warnings; - -+use Config; - use Getopt::Long; - use File::Spec; - use File::Compare qw( compare ); -@@ -136,14 +137,18 @@ - #---------------------------------------------- - sub run - { -+ my @run = $Config{run}; -+ @run = () if not defined $run[0] or $run[0] eq ''; - my @args = ("-I" . File::Spec->catdir((File::Spec->updir) x 2, 'lib'), @_); - my $run = $perl =~ m/\s/ ? qq("$perl") : $perl; - for (@args) { - $_ = qq("$_") if $^O eq 'VMS' && /^[^"]/; - $run .= " $_"; - } -- print "running $run\n"; -- system $run and die "$run failed: $?\n"; -+# print "running $run\n"; -+# system $run and die "$run failed: $?\n"; -+ print "running ", join(' ', @run, $run), "\n"; -+ system join(' ', @run, $run) and die "@run $run failed: $?\n"; - } - - __END__