From: Yitzchak Scott-Thoennes <sthoenna@efn.org>
Date: Fri, 6 Jan 2006 13:47:10 +0000 (-0800)
Subject: Cygwin issue (26792) and patchlevel (26790)
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=3591879277a8c0b18a5f875cc7f9b46814925f5d;p=p5sagit%2Fp5-mst-13.2.git

Cygwin issue (26792) and patchlevel (26790)

Subject: Re: Cygwin status, maint and blead
Date: Fri, 6 Jan 2006 13:47:10 -0800
Message-ID: <20060106214710.GA592@efn.org>

Subject: Re: Cygwin status, maint and blead
From: Yitzchak Scott-Thoennes <sthoenna@efn.org>
Date: Thu, 10 Nov 2005 00:46:33 -0800
Message-ID: <20051110084633.GA3364@efn.org>

p4raw-id: //depot/perl@26793
---

diff --git a/Configure b/Configure
index 64ea421..1e5301d 100755
--- a/Configure
+++ b/Configure
@@ -26,7 +26,7 @@
 
 # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
 #
-# Generated on Thu Jan  5 22:03:19 CET 2006 [metaconfig 3.0 PL70]
+# Generated on Wed Jan 11 21:57:24 CET 2006 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by perlbug@perl.org)
 
 cat >c1$$ <<EOF
@@ -5897,7 +5897,7 @@ if $test -r $rsrc/patchlevel.h;then
 	api_revision=`awk '/define[ 	]+PERL_API_REVISION/ {print $3}' $rsrc/patchlevel.h`
 	api_version=`awk '/define[ 	]+PERL_API_VERSION/ {print $3}' $rsrc/patchlevel.h`
 	api_subversion=`awk '/define[ 	]+PERL_API_SUBVERSION/ {print $3}' $rsrc/patchlevel.h`
-	perl_patchlevel=`grep 'define PERL_PATCHNUM [0-9][0-9]*' $rsrc/patchlevel.h|sed 's/[^0-9]//g'`
+	perl_patchlevel=`egrep 'define PERL_PATCHNUM [0-9][0-9]|,"MAINT[0-9][0-9]*"' $rsrc/patchlevel.h|sed 's/[^0-9]//g'`
 else
 	revision=0
 	patchlevel=0
@@ -5908,8 +5908,8 @@ else
 	perl_patchlevel=0
 	$echo "(You do not have patchlevel.h.  Eek.)"
 fi
-if $test -r $rsrc/.patch ; then  
-	if $test "`cat $rsrc/.patch`" -gt "$perl_patchlevel" ; then
+if $test -r $rsrc/.patch ; then
+	if $test "X$perl_patchlevel" = "X" || $test "`cat $rsrc/.patch`" -gt "$perl_patchlevel" ; then
 		perl_patchlevel=`cat $rsrc/.patch`
 	fi
 fi
@@ -15744,9 +15744,9 @@ $define)
 #endif
 END
     : see whether semctl IPC_STAT can use union semun
-    val="$undef"
     case "$d_semctl_semun" in
     '')
+      val="$undef"
       $cat > try.c <<END
 #include <sys/types.h>
 #include <sys/ipc.h>
@@ -15785,7 +15785,7 @@ int main() {
 	    printf("semctl IPC_STAT failed: errno = %d\n", errno);
 #	ifdef IPC_RMID
 	if (semctl(sem, 0, IPC_RMID, arg) != 0)
-#   	endif /* IPC_RMID */
+#	endif /* IPC_RMID */
 	    printf("semctl IPC_RMID failed: errno = %d\n", errno);
     } else
 #endif /* IPC_PRIVATE && ... */
@@ -15801,10 +15801,10 @@ END
           esac
       fi
       $rm -f try try.c
+      set d_semctl_semun
+      eval $setvar
       ;;
     esac
-    set d_semctl_semun
-    eval $setvar
     case "$d_semctl_semun" in
     $define)
         echo "You can use union semun for semctl IPC_STAT." >&4
@@ -15816,9 +15816,9 @@ END
     esac
 
     : see whether semctl IPC_STAT can use struct semid_ds pointer
-    val="$undef"
     case "$d_semctl_semid_ds" in
     '')
+      val="$undef"
       $cat > try.c <<'END'
 #include <sys/types.h>
 #include <sys/ipc.h>
@@ -15863,10 +15863,10 @@ END
           esac
       fi
       $rm -f try try.c
+      set d_semctl_semid_ds
+      eval $setvar
       ;;
     esac
-    set d_semctl_semid_ds
-    eval $setvar
     case "$d_semctl_semid_ds" in
     $define)
         echo "You can $also use struct semid_ds* for semctl IPC_STAT." >&4