Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 31bca45

Browse files
committed
I have included a couple of patches that will make postgres
compile out of the tar file on Solaris with the SUN 5.0 compilers. These compilers will be needed if you wan to compile the libpg++ interface without using the gcc/g++. The SC4.2 compilers do not understand the string class. The first patch changes the ecpg intermediate shared library name from *.sho to *.sho.o so that the SUN compiler will allow it to be used in conjunction with the -o option. Matthew C. Aycock
1 parent 6129de0 commit 31bca45

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

src/interfaces/ecpg/lib/Makefile.in

+4-4
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ endif
7474

7575
all: lib$(NAME).a $(shlib)
7676

77-
$(shlib): ecpglib.sho typename.sho
78-
$(LD) $(LDFLAGS_SL) -o $@ ecpglib.sho typename.sho
77+
$(shlib): ecpglib.sho.o typename.sho.o
78+
$(LD) $(LDFLAGS_SL) -o $@ ecpglib.sho typename.sho.o
7979

8080
clean:
8181
rm -f *.o *.sho *.a core a.out *~ $(shlib) lib$(NAME)$(DLSUFFIX)
@@ -104,7 +104,7 @@ ecpglib.o : ecpglib.c ../include/ecpglib.h ../include/ecpgtype.h
104104
typename.o : typename.c ../include/ecpgtype.h
105105
$(CC) $(CFLAGS) -I../include $(PQ_INCLUDE) -c $< -o $@
106106

107-
ecpglib.sho : ecpglib.c ../include/ecpglib.h ../include/ecpgtype.h
107+
ecpglib.sho.o : ecpglib.c ../include/ecpglib.h ../include/ecpgtype.h
108108
$(CC) $(CFLAGS) $(CFLAGS_SL) -I../include $(PQ_INCLUDE) -c $< -o $@
109-
typename.sho : typename.c ../include/ecpgtype.h
109+
typename.sho.o : typename.c ../include/ecpgtype.h
110110
$(CC) $(CFLAGS) $(CFLAGS_SL) -I../include $(PQ_INCLUDE) -c $< -o $@

src/interfaces/libpq++/pgenv.h

+5
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@
2020

2121
#include <string>
2222

23+
#ifdef __sun__
24+
#ifndef __GNUC__
25+
using namespace std;
26+
#endif
27+
#endif
2328

2429
//
2530
// these are the environment variables used for getting defaults

0 commit comments

Comments
 (0)