summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian1998-09-13 04:00:44 +0000
committerBruce Momjian1998-09-13 04:00:44 +0000
commitf363334a44cb6892df07de28f5b861397e1509fe (patch)
tree01268cfc6e9b16e97df568a48a7fcb754fd338de
parent6a12cdc284b36def1c1f575cb0f1f55cbc8fc9d5 (diff)
Here are some additional patches needed to get the UnixWare 7 C++
compiler to attempt to compile libpq++. The patches address the following problems: 1. In my first pass at changing the libpq++ makefile, I forgot to include the PORTNAME in the Makefile.in file. 2. The UnixWare 7 C++ compiler did not like the '-K alloca' option in CXXFLAGS. Billy G. Allie
-rw-r--r--src/interfaces/libpq++/Makefile.in10
-rw-r--r--src/template/univel2
-rw-r--r--src/template/unixware2
3 files changed, 12 insertions, 2 deletions
diff --git a/src/interfaces/libpq++/Makefile.in b/src/interfaces/libpq++/Makefile.in
index f44b90d89d..f47f992f8f 100644
--- a/src/interfaces/libpq++/Makefile.in
+++ b/src/interfaces/libpq++/Makefile.in
@@ -20,6 +20,8 @@ LIBNAME= libpq++
CXX=@CXX@
+PORTNAME=@PORTNAME@
+
# We have to override -Werror, which makes warnings, fatal, because we
# inevitably get the warning, "abstract declarator used as declaration"
# because of our inclusion of c.h and we don't know how to stop that.
@@ -67,6 +69,10 @@ ifeq ($(PORTNAME), unixware)
shlib := libpq.so.1
LDFLAGS_SL = -G -z text
CFLAGS += $(CFLAGS_SL)
+ ifeq ($(CXX), CC)
+ CXXFLAGS += -Xw
+ COMPILE.cc = $(CXX) $(CXXFLAGS:ll,alloca=ll) $(CPPFLAGS) $(TARGET_ARCH) -c
+ endif
endif
ifeq ($(PORTNAME), univel)
@@ -74,6 +80,10 @@ ifeq ($(PORTNAME), univel)
shlib := libpq.so.1
LDFLAGS_SL = -G -z text
CFLAGS += $(CFLAGS_SL)
+ ifeq ($(CXX), CC)
+ CXXFLAGS += -Xw
+ COMPILE.cc = $(CXX) $(CXXFLAGS:ll,alloca=ll) $(CPPFLAGS) $(TARGET_ARCH) -c
+ endif
endif
ifeq ($(PORTNAME), hpux)
diff --git a/src/template/univel b/src/template/univel
index 21b8592663..dcdfae8af4 100644
--- a/src/template/univel
+++ b/src/template/univel
@@ -1,5 +1,5 @@
AROPT:crs
-CFLAGS:-Xa -v -O -K i486,host,inline,loop_unroll -Dsvr4
+CFLAGS:-v -O -K i486,host,inline,loop_unroll -Dsvr4
SHARED_LIB:-K PIC
SRCH_INC:
SRCH_LIB:
diff --git a/src/template/unixware b/src/template/unixware
index a174807cb3..0dd81b5c2d 100644
--- a/src/template/unixware
+++ b/src/template/unixware
@@ -1,5 +1,5 @@
AROPT:crs
-CFLAGS:-Xa -v -O -K i486,host,inline,loop_unroll,alloca -Dsvr4
+CFLAGS:-O -K i486,host,inline,loop_unroll,alloca -Dsvr4
SHARED_LIB:-K PIC
SRCH_INC:/opt/include
SRCH_LIB:/opt/lib