Merged revisions 63897-63898 via svnmerge from

thomas.heller · thomas.heller · commit 0be8ed3697f1 · 2008-06-06T09:11:46.000Z
svn+ssh://pythondev@svn.python.org/python/trunk ........ r63897 | thomas.heller | 2008-06-02 20:41:30 +0200 (Mon, 02 Jun 2008) | 1 line Fix misspelled sys.platform name and misspelled filename. ........ r63898 | thomas.heller | 2008-06-02 22:07:46 +0200 (Mon, 02 Jun 2008) | 1 line Fix the -x flag so that is does work. ........ git-svn-id: http://svn.python.org/projects/python/branches/py3k@63979 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Lib/ctypes/test/__init__.py b/Lib/ctypes/test/__init__.py
@@ -178,7 +178,7 @@ def main(*packages):
         elif flag == "-u":
             use_resources.extend(value.split(","))
         elif flag == "-x":
-            exclude.append(value.split(","))
+            exclude.extend(value.split(","))
 
     mask = "test_*.py"
     if args:
diff --git a/Modules/_ctypes/libffi/fficonfig.py.in b/Modules/_ctypes/libffi/fficonfig.py.in
@@ -25,7 +25,7 @@ ffi_platforms = {
     'SH64': ['src/sh64/sysv.S', 'src/sh64/ffi.c'],
     'PA': ['src/pa/linux.S', 'src/pa/ffi.c'],
     'PA_LINUX': ['src/pa/linux.S', 'src/pa/ffi.c'],
-    'PA_HPUX': ['src/pa/hpux32.s', 'src/pa/ffi.c'],
+    'PA_HPUX': ['src/pa/hpux32.S', 'src/pa/ffi.c'],
 }
 
 ffi_srcdir = '@srcdir@'
diff --git a/setup.py b/setup.py
@@ -1416,7 +1416,7 @@ def detect_ctypes(self, inc_dirs, lib_dirs):
             # finding some -z option for the Sun compiler.
             extra_link_args.append('-mimpure-text')
 
-        elif sys.platform.startswith('hpux'):
+        elif sys.platform.startswith('hp-ux'):
             extra_link_args.append('-fPIC')
 
         ext = Extension('_ctypes',

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ ffi_platforms = {`
`25`	`25`	`'SH64': ['src/sh64/sysv.S', 'src/sh64/ffi.c'],`
`26`	`26`	`'PA': ['src/pa/linux.S', 'src/pa/ffi.c'],`
`27`	`27`	`'PA_LINUX': ['src/pa/linux.S', 'src/pa/ffi.c'],`
`28`		`- 'PA_HPUX': ['src/pa/hpux32.s', 'src/pa/ffi.c'],`
	`28`	`+ 'PA_HPUX': ['src/pa/hpux32.S', 'src/pa/ffi.c'],`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`ffi_srcdir = '@srcdir@'`