packages: root/root-make_version.patch - up for 5.28.00

lisu lisu at pld-linux.org
Wed Dec 15 14:23:02 CET 2010


Author: lisu                         Date: Wed Dec 15 13:23:02 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up for 5.28.00

---- Files affected:
packages/root:
   root-make_version.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/root/root-make_version.patch
diff -u packages/root/root-make_version.patch:1.1 packages/root/root-make_version.patch:1.2
--- packages/root/root-make_version.patch:1.1	Wed Aug 25 16:19:31 2010
+++ packages/root/root-make_version.patch	Wed Dec 15 14:22:57 2010
@@ -1,15 +1,15 @@
---- root/configure~	2010-08-25 15:38:25.529356489 +0200
-+++ root/configure	2010-08-25 15:40:21.722687685 +0200
-@@ -1623,35 +1623,6 @@
+--- root/configure~	2010-12-14 15:20:27.000000000 +0100
++++ root/configure	2010-12-15 13:27:41.775091133 +0100
+@@ -1951,39 +1951,6 @@
  
  ######################################################################
  #
--### echo %%% check for GNU make >= 3.79.1 - Mandatory version of make
+-### echo %%% check for GNU make >= 3.80 - Mandatory version of make
 -#
 -# Mandatory test, must succeed
--# Check for GNU make >= 3.79.1
+-# Check for GNU make >= 3.80
 -#
--message "Checking for GNU Make version >= 3.79.1"
+-message "Checking for GNU Make version >= 3.80"
 -gnumake="make"
 -gnu=`$gnumake -v 2>&1 | awk 'BEGIN { FS=" "} { if (NR==1) print $1 }'`
 -if test ! "x$gnu" = "xGNU" ; then
@@ -21,13 +21,17 @@
 -fi
 -if test ! "x$gnumake" = "x" ; then
 -    gnuv=`$gnumake -v | tr '.,' ' ' | awk 'BEGIN { FS=" "} { if (NR==1 && $3 == "version") printf "%d", ($4*1000)+($5*10)+$6; else printf "%d", ($3*1000)+($4*10)+$5 }'`
--    if test $gnuv -lt 3791 ; then
--        result "`basename $0`: GNU Make >= 3.79.1 MUST be installed, current version $gnuv is too old"
+-    if test $gnuv -lt 3800 ; then
+-        result "no"
+-        result "`basename $0`: GNU Make >= 3.80 MUST be installed, current version $gnuv is too old"
+-        result "See http://root.cern.ch/drupal/content/build-prerequisites"
 -        exit 1
 -    fi
 -    result "ok"
 -else
--    result "`basename $0`: GNU Make >= 3.79.1 MUST be installed"
+-    result "no"
+-    result "`basename $0`: GNU Make >= 3.80 MUST be installed"
+-    result "See http://root.cern.ch/drupal/content/build-prerequisites"
 -    exit 1
 -fi
 -
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/root/root-make_version.patch?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list