X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Fhpux.sh;h=d1fbb3a4806346a173313d1e7c8bc23b50a7bf04;hb=9ad0a0f606dfe6bb2ec67942ae23eef93c8ce770;hp=281f289c9b36adbabbe046dd08573f41747a5279;hpb=f1c73faff486d8cc820539ef43970bf49c246509;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/hints/hpux.sh b/hints/hpux.sh
index 281f289..d1fbb3a 100644
--- a/hints/hpux.sh
+++ b/hints/hpux.sh
@@ -80,6 +80,16 @@ EOM
 	esac
     else
 	ccflags="$ccflags -Aa"	# The add-on compiler supports ANSI C
+	# cppstdin and cpprun need the -Aa option if you use the unbundled 
+	# ANSI C compiler (*not* the bundled K&R compiler or gcc)
+	# [XXX this should be set automatically by Configure, but isn't yet.]
+	# [XXX This is reported not to work.  You may have to edit config.sh.
+	#  After running Configure, set cpprun and cppstdin in config.sh,
+	#  run "Configure -S" and then "make".]
+	cpprun="${cc:-cc} -E -Aa"
+	cppstdin="$cpprun"
+	cppminus='-'
+	cpplast='-'
     fi
     # For HP's ANSI C compiler, up to "+O3" is safe for everything
     # except shared libraries (PIC code).  Max safe for PIC is "+O2".
@@ -128,6 +138,27 @@ else
 	selecttype='int *'
 fi
 
+# Under 10.X, a threaded perl can be built, but it needs
+# libcma and OLD_PTHREADS_API.  Also <pthread.h> needs to
+# be #included before any other includes (in perl.h)
+if [ "$xxOsRevMajor" -eq 10 -a "X$usethreads" = "X$define" ]; then
+
+    # HP-UX 10.X uses the old pthreads API
+    case "$d_oldpthreads" in
+    '') d_oldpthreads="$define" ;;
+    esac
+
+    # include libcma before all the others
+    libswanted="cma $libswanted"
+
+    # tell perl.h to include <pthread.h> before other include files
+    ccflags="$ccflags -DPTHREAD_H_FIRST"
+
+    # CMA redefines select to cma_select, and cma_select expects int *
+    # instead of fd_set * (just like 9.X)
+    selecttype='int *'
+fi
+
 
 # Remove bad libraries that will cause problems
 # (This doesn't remove libraries that don't actually exist)
@@ -183,24 +214,3 @@ esac
 #     assembler of the form:
 #          (warning) Use of GR3 when frame >= 8192 may cause conflict.
 #     These warnings are harmless and can be safely ignored.
-
-#
-# cppstdin and cpprun need the -Aa option if you use the unbundled 
-# ANSI C compiler (*not* the bundled K&R compiler or gcc)
-# [XXX this should be enabled automatically by Configure, but isn't yet.]
-# [XXX This is reported not to work.  You may have to edit config.sh.
-#  After running Configure, set cpprun and cppstdin in config.sh,
-#  run "Configure -S" and then "make".]
-#
-case "$cppstdin" in
-'')
-    case "$ccflags" in
-    *-Aa*)
-	cpprun="${cc:-cc} -E -Aa"
-	cppstdin="$cpprun"
-	cppminus='-'
-	cpplast='-'
-	;;
-    esac
-    ;;
-esac