Ignore:
Timestamp:
Feb 5, 2004, 6:04:20 PM (16 years ago)
Author:
ssen
Message:

Search for python2.3 before python2.2, so that it finds the dports
python on Jaguar

Location:
trunk/dports/sysutils/rpm
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/sysutils/rpm/Portfile

    r5195 r5213  
    1 # $Id: Portfile,v 1.9 2004/02/04 22:58:53 ssen Exp $
     1# $Id: Portfile,v 1.10 2004/02/05 18:04:20 ssen Exp $
    22
    33PortSystem 1.0
     
    55version                 4.0.4
    66platforms               darwin
    7 revision                5
     7revision                6
    88categories              sysutils archivers
    99maintainers             ssen@opendarwin.org
  • trunk/dports/sysutils/rpm/files/patch-configure.diff

    r5177 r5213  
    1 --- configure.orig      Tue Feb  3 11:10:23 2004
    2 +++ configure   Tue Feb  3 11:21:37 2004
    3 @@ -12543,6 +12543,37 @@
    4      WITH_PYTHON_VERSION="2.2"
     1--- configure.orig      Thu Feb  5 09:38:05 2004
     2+++ configure   Thu Feb  5 09:39:47 2004
     3@@ -12512,8 +12512,8 @@
     4 WITH_PYTHON_VERSION=
     5 if test $withval = auto ; then
     6 
     7-  echo $ac_n "checking for python 2.2""... $ac_c" 1>&6
     8-echo "configure:12517: checking for python 2.2" >&5
     9+  echo $ac_n "checking for python 2.3""... $ac_c" 1>&6
     10+echo "configure:12517: checking for python 2.3" >&5
     11   if test "$cross_compiling" = yes; then
     12   withval=yes
     13 else
     14@@ -12521,9 +12521,9 @@
     15 #line 12522 "configure"
     16 #include "confdefs.h"
     17 
     18-#include <python2.2/Python.h>
     19+#include <python2.3/Python.h>
     20 main() {
     21-  exit(strncmp("2.2", PY_VERSION, 3));
     22+  exit(strncmp("2.3", PY_VERSION, 3));
     23 }
     24 EOF
     25 if { (eval echo configure:12530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
     26@@ -12540,9 +12540,40 @@
     27 
     28   echo "$ac_t""$withval" 1>&6
     29   if test $withval = yes ; then
     30-    WITH_PYTHON_VERSION="2.2"
     31+    WITH_PYTHON_VERSION="2.3"
    532   else
    633 
    7 +       echo $ac_n "checking for python 2.3""... $ac_c" 1>&6
    8 +       echo "configure:12517: checking for python 2.3" >&5
     34+       echo $ac_n "checking for python 2.2""... $ac_c" 1>&6
     35+       echo "configure:12517: checking for python 2.2" >&5
    936+       if test "$cross_compiling" = yes; then
    1037+           withval=yes
     
    1441+#include "confdefs.h"
    1542+
    16 +#include <python2.3/Python.h>
     43+#include <python2.2/Python.h>
    1744+main() {
    18 +       exit(strncmp("2.3", PY_VERSION, 3));
     45+       exit(strncmp("2.2", PY_VERSION, 3));
    1946+}
    2047+EOF
     
    3360+       echo "$ac_t""$withval" 1>&6
    3461+       if test $withval = yes ; then
    35 +           WITH_PYTHON_VERSION="2.3"
     62+           WITH_PYTHON_VERSION="2.2"
    3663+       else
    3764+
Note: See TracChangeset for help on using the changeset viewer.