Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/python/python26/patches/Python26-24-makedev.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Mon, 11 Mar 2013 10:38:09 -0700
branchs11-update
changeset 2520 ceec631e74d1
parent 841 1a62cefa636d
permissions -rw-r--r--
Close of build 10.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
841
1a62cefa636d 7121707 python 2.6.4 should be updated to latest 2.6.X release
Rich Burridge <rich.burridge@oracle.com>
parents: 578
diff changeset 
     1
 
--- Python-2.6.8/configure.in.orig	2012-05-14 06:24:15.149791072 -0700
1a62cefa636d 7121707 python 2.6.4 should be updated to latest 2.6.X release
Rich Burridge <rich.burridge@oracle.com>
parents: 578
diff changeset 
     2
 
+++ Python-2.6.8/configure.in	2012-05-14 06:27:52.383479003 -0700
1a62cefa636d 7121707 python 2.6.4 should be updated to latest 2.6.X release
Rich Burridge <rich.burridge@oracle.com>
parents: 578
diff changeset 
     3
 
@@ -1416,36 +1416,9 @@
578
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
     4
 
 ])
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
     5
 
 AC_MSG_RESULT($was_it_defined)
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
     6
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
     7
 
-# Check whether using makedev requires defining _OSF_SOURCE
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
     8
 
-AC_MSG_CHECKING(for makedev)
841
1a62cefa636d 7121707 python 2.6.4 should be updated to latest 2.6.X release
Rich Burridge <rich.burridge@oracle.com>
parents: 578
diff changeset 
     9
 
-AC_TRY_LINK([
1a62cefa636d 7121707 python 2.6.4 should be updated to latest 2.6.X release
Rich Burridge <rich.burridge@oracle.com>
parents: 578
diff changeset 
    10
 
-#if defined(MAJOR_IN_MKDEV)
1a62cefa636d 7121707 python 2.6.4 should be updated to latest 2.6.X release
Rich Burridge <rich.burridge@oracle.com>
parents: 578
diff changeset 
    11
 
-#include <sys/mkdev.h>
1a62cefa636d 7121707 python 2.6.4 should be updated to latest 2.6.X release
Rich Burridge <rich.burridge@oracle.com>
parents: 578
diff changeset 
    12
 
-#elif defined(MAJOR_IN_SYSMACROS)
1a62cefa636d 7121707 python 2.6.4 should be updated to latest 2.6.X release
Rich Burridge <rich.burridge@oracle.com>
parents: 578
diff changeset 
    13
 
-#include <sys/sysmacros.h>
1a62cefa636d 7121707 python 2.6.4 should be updated to latest 2.6.X release
Rich Burridge <rich.burridge@oracle.com>
parents: 578
diff changeset 
    14
 
-#else
1a62cefa636d 7121707 python 2.6.4 should be updated to latest 2.6.X release
Rich Burridge <rich.burridge@oracle.com>
parents: 578
diff changeset 
    15
 
-#include <sys/types.h>
1a62cefa636d 7121707 python 2.6.4 should be updated to latest 2.6.X release
Rich Burridge <rich.burridge@oracle.com>
parents: 578
diff changeset 
    16
 
-#endif ],
578
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    17
 
-	    [ makedev(0, 0) ],
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    18
 
-	    ac_cv_has_makedev=yes,
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    19
 
-	    ac_cv_has_makedev=no)
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    20
 
-if test "$ac_cv_has_makedev" = "no"; then
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    21
 
-    # we didn't link, try if _OSF_SOURCE will allow us to link
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    22
 
-    AC_TRY_LINK([
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    23
 
-#define _OSF_SOURCE 1
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    24
 
-#include <sys/types.h>
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    25
 
-    ],
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    26
 
-    [ makedev(0, 0) ],
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    27
 
-    ac_cv_has_makedev=yes,
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    28
 
-    ac_cv_has_makedev=no)
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    29
 
-    if test "$ac_cv_has_makedev" = "yes"; then
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    30
 
-        AC_DEFINE(_OSF_SOURCE, 1, [Define _OSF_SOURCE to get the makedev macro.])
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    31
 
-    fi
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    32
 
-fi
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    33
 
-AC_MSG_RESULT($ac_cv_has_makedev)
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    34
 
-if test "$ac_cv_has_makedev" = "yes"; then
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    35
 
-    AC_DEFINE(HAVE_MAKEDEV, 1, [Define this if you have the makedev macro.])
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    36
 
-fi
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    37
 
+# Solaris has makedev, and posixmodule already has all the right #include
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    38
 
+# statements.
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    39
 
+AC_DEFINE(HAVE_MAKEDEV, 1, [Define this if you have the makedev macro.])
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    40
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    41
 
 # Enabling LFS on Solaris (2.6 to 9) with gcc 2.95 triggers a bug in
4f51372decaf 7053223 python needs lint libraries
Danek Duvall <danek.duvall@oracle.com>
parents:
diff changeset 
    42
 
 # the system headers: If _XOPEN_SOURCE and _LARGEFILE_SOURCE are
upstream/oracle/userland-gate