[Pkg-grid-commits] gpt/debian/patches 00list, 1.2, 1.3 97_reduce_build_complexity.dpatch, NONE, 1.1 98_reduce_build_complexity.dpatch, NONE, 1.1

Steffen Möller smoe-guest at alioth.debian.org
Tue Mar 25 15:03:27 UTC 2008


Update of /cvsroot/pkg-grid/gpt/debian/patches
In directory alioth:/tmp/cvs-serv31910/patches

Modified Files:
	00list 
Added Files:
	97_reduce_build_complexity.dpatch 
	98_reduce_build_complexity.dpatch 
Log Message:
Updates for Globus Toolkit's version of GPT.


--- NEW FILE: 97_reduce_build_complexity.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 97_reduce_build_complexity.dpatch by Steffen Moeller <steffen_moeller at gmx.de>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad gpt~/build_gpt gpt/build_gpt
--- gpt~/build_gpt	2008-03-25 15:23:22.000000000 +0100
+++ gpt/build_gpt	2008-03-25 15:28:14.000000000 +0100
@@ -70,19 +70,19 @@
                 );
 
 my %builddirections = (
-                       'perltest' => 'perl',
-                       'perlpatch' => 'perl',
-                       'perltar' => 'perl',
-                       'autoconf' => 'autotools',
-                       'automake' => 'autotools',
-                       'libtool' => 'autotools',
-                       'oldautoconf' => 'oldautotools',
-                       'oldautomake' => 'oldautotools',
-                       'oldlibtool' => 'oldautotools',
-                       'perlzlib' => 'compress',
-                       'perlzlibio' => 'perl',
-                       'filespec' => 'perl',
-                       'podparser' => 'perl',
+             #          'perltest' => 'perl',
+             #          'perlpatch' => 'perl',
+             #          'perltar' => 'perl',
+             #          'autoconf' => 'autotools',
+             #          'automake' => 'autotools',
+             #          'libtool' => 'autotools',
+             #          'oldautoconf' => 'oldautotools',
+             #          'oldautomake' => 'oldautotools',
+             #          'oldlibtool' => 'oldautotools',
+             #          'perlzlib' => 'compress',
+             #          'perlzlibio' => 'perl',
+             #          'filespec' => 'perl',
+             #          'podparser' => 'perl',
                        'md5' => 'perl',
                        'gpt' => 'gpt',
                       );
@@ -95,52 +95,52 @@
 $shutup = "" if defined $verbose;
 
 my %commands = (
-                autotools => ["PATH=$gpt_location/newautotools/bin:$ENV{'PATH'}; export PATH; \\
-GPT_LOCATION=$gpt_location; export GPT_LOCATION; \\
-PERL=$perl_location export PERL; \\
-./configure --prefix=$gpt_location/newautotools", 
-                              "PATH=$gpt_location/newautotools/bin:$ENV{'PATH'}; export PATH;make", 
-                              "PATH=$gpt_location/newautotools/bin:$ENV{'PATH'}; export PATH; \\
-make install $shutup"
-                             ],
-                oldautotools => ["PATH=$gpt_location/oldautotools/bin:$ENV{'PATH'}; export PATH; GPT_LOCATION=$gpt_location; export GPT_LOCATION; ./configure --prefix=$gpt_location/oldautotools", 
-                              "make", 
-                              "make install"
-                             ],
+#                autotools => ["PATH=$gpt_location/newautotools/bin:$ENV{'PATH'}; export PATH; \\
+#GPT_LOCATION=$gpt_location; export GPT_LOCATION; \\
+#PERL=$perl_location export PERL; \\
+#./configure --prefix=$gpt_location/newautotools", 
+#                              "PATH=$gpt_location/newautotools/bin:$ENV{'PATH'}; export PATH;make", 
+#                              "PATH=$gpt_location/newautotools/bin:$ENV{'PATH'}; export PATH; \\
+#make install $shutup"
+#                             ],
+#                oldautotools => ["PATH=$gpt_location/oldautotools/bin:$ENV{'PATH'}; export PATH; GPT_LOCATION=$gpt_location; export GPT_LOCATION; ./configure --prefix=$gpt_location/oldautotools", 
+#                              "make", 
+#                              "make install"
+#                             ],
                 gpt => ["GPT_LOCATION=$gpt_location; export GPT_LOCATION; \\
 ./configure --with-perl=$perl_location", 
                         "make", 
                         "make install",
                         "make install-man",
                        ],
-                 perl => ["unset LANG; \\\
-PERL5LIB=$gpt_location/lib/perl:$ENV{'PERL5LIB'}; export PERL5LIB; \\\
-$perl_location Makefile.PL \\\
-INSTALLDIRS=perl LIB=$gpt_location/lib/perl \\\
-INSTALLSCRIPT=$gpt_location/sbin INSTALLMAN1DIR=$gpt_location/man/man1 \\\
-INSTALLMAN3DIR=$gpt_location/man/man3",
-                      'make', 
-                      'make install',
-                     ],             ,
-                compress => ["if test -f Zlib.c; then \
-echo 'removing Zlib.c'; \
-rm Zlib.c; \
-fi",
-			  "unset LANG; \\\
-$perl_location Makefile.PL $zlibdownflag \\\
-INSTALLDIRS=perl LIB=$gpt_location/lib/perl \\\
-INSTALLSCRIPT=$gpt_location/sbin \\\
-INSTALLMAN1DIR=$gpt_location/man/man1 \\\
-INSTALLMAN3DIR=$gpt_location/man/man3 $shutup",
-			  "unset LANG; \\\
-$perl_location Makefile.PL \\\
-INSTALLDIRS=perl LIB=$gpt_location/lib/perl \\\
-INSTALLSCRIPT=$gpt_location/sbin \\\
-INSTALLMAN1DIR=$gpt_location/man/man1 \\\
-INSTALLMAN3DIR=$gpt_location/man/man3 $shutup",
-                         "make $shutup", 
-                         "make install $shutup"
-                        ]
+#                 perl => ["unset LANG; \\\
+#PERL5LIB=$gpt_location/lib/perl:$ENV{'PERL5LIB'}; export PERL5LIB; \\\
+#$perl_location Makefile.PL \\\
+#INSTALLDIRS=perl LIB=$gpt_location/lib/perl \\\
+#INSTALLSCRIPT=$gpt_location/sbin INSTALLMAN1DIR=$gpt_location/man/man1 \\\
+#INSTALLMAN3DIR=$gpt_location/man/man3",
+#                      'make', 
+#                      'make install',
+#                     ],             ,
+#                compress => ["if test -f Zlib.c; then \
+#echo 'removing Zlib.c'; \
+#rm Zlib.c; \
+#fi",
+#			  "unset LANG; \\\
+#$perl_location Makefile.PL $zlibdownflag \\\
+#INSTALLDIRS=perl LIB=$gpt_location/lib/perl \\\
+#INSTALLSCRIPT=$gpt_location/sbin \\\
+#INSTALLMAN1DIR=$gpt_location/man/man1 \\\
+#INSTALLMAN3DIR=$gpt_location/man/man3 $shutup",
+##			  "unset LANG; \\\
+#$perl_location Makefile.PL \\\
+#INSTALLDIRS=perl LIB=$gpt_location/lib/perl \\\
+#INSTALLSCRIPT=$gpt_location/sbin \\\
+#INSTALLMAN1DIR=$gpt_location/man/man1 \\\
+#INSTALLMAN3DIR=$gpt_location/man/man3 $shutup",
+#                         "make $shutup", 
+#                         "make install $shutup"
+#                        ]
                );
 my %boot = (
              gpt => "PATH=$gpt_location/newautotools/bin:$ENV{'PATH'}; export PATH; ./bootstrap",
@@ -212,8 +212,8 @@
   next if ! defined $test;
   next if ! grep { $_ eq $s } @testdirs;
 
-  $log->announce("testing $dir");
-  action("PERL5LIB=$gpt_location/lib/perl:$ENV{'PERL5LIB'}; export PERL5LIB; make test", $dir, 1);
+  #$log->announce("testing $dir");
+  #action("PERL5LIB=$gpt_location/lib/perl:$ENV{'PERL5LIB'}; export PERL5LIB; make test", $dir, 1);
 
 }
 

--- NEW FILE: 98_reduce_build_complexity.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 98_reduce_build_complexity.dpatch by Steffen Moeller <steffen_moeller at gmx.de>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad gpt~/tools/DistGPT.pm gpt/tools/DistGPT.pm
--- gpt~/tools/DistGPT.pm	2006-01-11 17:10:13.000000000 +0100
+++ gpt/tools/DistGPT.pm	2008-03-25 15:13:41.000000000 +0100
@@ -33,21 +33,21 @@
             );
 
 my @buildorder = (
-             "zlib",
-             "perlzlib",
-             "perlzlibio",
-             "perltest",
-             "perlpatch",
-             "perltar",
-             "oldautoconf",
-             "oldlibtool",
-             "oldautomake",
-             "autoconf",
-             "libtool",
-             "automake",
-             "filespec",
-             "podparser",
-             "md5",
+#             "zlib",
+#             "perlzlib",
+#             "perlzlibio",
+#             "perltest",
+#             "perlpatch",
+#             "perltar",
+#             "oldautoconf",
+#             "oldlibtool",
+#             "oldautomake",
+#             "autoconf",
+#             "libtool",
+#             "automake",
+#             "filespec",
+#             "podparser",
+#             "md5",
              "core",
              "gpt",
             );

Index: 00list
===================================================================
RCS file: /cvsroot/pkg-grid/gpt/debian/patches/00list,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- 00list	2 Feb 2007 22:35:54 -0000	1.2
+++ 00list	25 Mar 2008 15:03:23 -0000	1.3
@@ -1,4 +1,6 @@
 01_globus_package_dtd.dpatch
-02_gpt_globus395.dpatch
 03_gpt_setupdir.dpatch
-99_reduce_build_complexity.dpatch
+97_reduce_build_complexity.dpatch
+98_reduce_build_complexity.dpatch
+#99_reduce_build_complexity.dpatch
+#02_gpt_globus395.dpatch




More information about the Pkg-grid-commits mailing list