From af8e2760ba4ad2369eee23d920a89a8ea8b8fcc4 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Sun, 13 Sep 1998 04:00:44 +0000
Subject: [PATCH] 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
---
src/interfaces/libpq++/Makefile.in | 12 +++++++++++-
src/template/univel | 2 +-
src/template/unixware | 2 +-
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/interfaces/libpq++/Makefile.in b/src/interfaces/libpq++/Makefile.in
index 38c56c12a4c..811d743ae94 100644
--- a/src/interfaces/libpq++/Makefile.in
+++ b/src/interfaces/libpq++/Makefile.in
@@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile.in,v 1.1 1998/09/11 16:56:23 momjian Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile.in,v 1.2 1998/09/13 04:00:41 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -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 21b85926638..dcdfae8af4a 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 a174807cb37..0dd81b5c2d7 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
--
GitLab