From d5b9507dec898d2cfa65fb38a136f9428094c84c Mon Sep 17 00:00:00 2001
From: Ralph Lange <Ralph.Lange@bessy.de>
Date: Mon, 3 Jul 2000 10:06:03 +0000
Subject: [PATCH] More small changes for HP-UX (hpux-parisc)

---
 configure/os/CONFIG.Common.UnixCommon       |  3 +--
 configure/os/CONFIG.Common.hpux-parisc      | 11 +++++++++
 configure/os/CONFIG.hpux-parisc.hpux-parisc | 27 ++++++++++-----------
 configure/os/CONFIG_COMPAT                  |  2 +-
 4 files changed, 26 insertions(+), 17 deletions(-)
 create mode 100644 configure/os/CONFIG.Common.hpux-parisc

diff --git a/configure/os/CONFIG.Common.UnixCommon b/configure/os/CONFIG.Common.UnixCommon
index 56c820c95..a7bb15868 100644
--- a/configure/os/CONFIG.Common.UnixCommon
+++ b/configure/os/CONFIG.Common.UnixCommon
@@ -8,7 +8,7 @@
 #  Sites may override definitions in CONFIG_SITE.Common.UnixCommon
 #  or CONFIG_SITE.<host>.UnixCommon
 #-------------------------------------------------------
- 
+
 # Unix valid build types
 VALID_BUILDS = Host Ioc
 
@@ -71,4 +71,3 @@ LINK.shrlib = $(CXX) -o $@ $(SHRLIB_LDFLAGS) $(LDFLAGS)
 # Allow site overrides
 -include $(CONFIG)/os/CONFIG_SITE.Common.UnixCommon
 -include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).UnixCommon
-
diff --git a/configure/os/CONFIG.Common.hpux-parisc b/configure/os/CONFIG.Common.hpux-parisc
new file mode 100644
index 000000000..15fe89ec1
--- /dev/null
+++ b/configure/os/CONFIG.Common.hpux-parisc
@@ -0,0 +1,11 @@
+# CONFIG.Common.hpux-68k
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for hpux-68k target archs
+# Sites may override these definitions in CONFIG_SITE.Common.hpux-68k
+#-------------------------------------------------------
+
+#Include definitions common to unix hosts
+include $(CONFIG)/os/CONFIG.Common.UnixCommon
diff --git a/configure/os/CONFIG.hpux-parisc.hpux-parisc b/configure/os/CONFIG.hpux-parisc.hpux-parisc
index 8b05c8a1a..c8a86c876 100644
--- a/configure/os/CONFIG.hpux-parisc.hpux-parisc
+++ b/configure/os/CONFIG.hpux-parisc.hpux-parisc
@@ -7,9 +7,6 @@
 # Sites may override these definitions in CONFIG_SITE.hpux-parisc.hpux-parisc
 #-------------------------------------------------------
 
-# Include definitions common to all vxWorks target archs
-include $(CONFIG)/os/CONFIG.Common.vxWorksCommon
-
 OS_CLASS = hpux
 ARCH_CLASS = parisc
 
@@ -23,15 +20,15 @@ ACC_WARN_NO = -w
 ACC_OPT_YES = -O
 ACC_OPT_NO = -g
 ACC_STATIC_CFLAGS_YES= -Wl,-a,archive
-ACC_STATIC_CFLAGS_NO=
+ACC_STATIC_CFLAGS_NO =
 ACC_STATIC_LDLIBS_YES =
-ACC_STATIC_LDLIBS_NO=
+ACC_STATIC_LDLIBS_NO =
 ACC_SHRLIB_LDFLAGS_YES = -b
 
 # Configure OS vendor C++ compiler
 CCC = aCC
 # avoid treating "future errors" as actual errors
-CCC_CONFORM_CFLAGS_NORMAL = +W302 +W829 +W818 +W392 +W469 +W495 +W749 +W667 +W749 +W392 +W684
+CCC_CONFORM_CFLAGS_NORMAL = +W302 +W829 +W818 +W392 +W469 +W495 +W749 +W667 +W392 +W684
 CCC_CONFORM_CFLAGS_STRICT = +p
 CCC_TEMPL_INST_FLAG =
 CCC_WARN_YES = +w
@@ -39,23 +36,25 @@ CCC_WARN_NO =
 CCC_OPT_YES = -O
 CCC_OPT_NO = -g
 CCC_STATIC_CFLAGS_YES= +A
-CCC_STATIC_CFLAGS_NO=
+CCC_STATIC_CFLAGS_NO =
 CCC_STATIC_LDLIBS_YES =
-CCC_STATIC_LDLIBS_NO=
+CCC_STATIC_LDLIBS_NO =
 # shared libs will be found by searching environment variable SHLIB_PATH,
 # then by searching the specified path (see below)
 CCC_SHRLIB_LDFLAGS_YES = -b
-
-CCC_DEPENDS_FLAG =
+CCC_DEPENDS_FLAG = +m
 
 # +DAportable causes portable object code to be created for execution
 # on different PA-Risc machines
 ARCH_DEP_CPPFLAGS = -D_HPUX_SOURCE -DHP_UX
-ARCH_DEP_CFLAGS = +DAportable
-ARCH_DEP_CXXFLAGS = +DAportable
+ARCH_DEP_CFLAGS = +DAportable +z
+ARCH_DEP_CXXFLAGS = +DAportable +z
 ARCH_DEP_LDLIBS =
-ARCH_DEP_LDFLAGS = -Wl,+s,+b$(DEFAULT_SHRLIB_SEARCH_PATH)
+ARCH_DEP_LDFLAGS = -Wl,+b$(DEFAULT_SHRLIB_SEARCH_PATH),+s
 
-AR = ar
+AR = ar -rc
 
 SHRLIB_SUFFIX = .sl
+
+# HP's aCC will not compile things if run in STRICT mode
+CXXCMPLR=NORMAL
diff --git a/configure/os/CONFIG_COMPAT b/configure/os/CONFIG_COMPAT
index 4cf3b284c..1f8584e31 100644
--- a/configure/os/CONFIG_COMPAT
+++ b/configure/os/CONFIG_COMPAT
@@ -12,7 +12,7 @@ ARCH_solaris = solaris-sparc
 ARCH_sun4 = sun4-sparc
 ARCH_Linux = linux-x86
 ARCH_WIN32 = win32-x86
-ARCH_hp700 = hpux-m68k
+ARCH_hp700 = hpux-parisc
 ARCH_alpha = osf-alpha
 ARCH_cygwin32 = cygwin-x86