diff options
| author | Bruce Momjian | 1998-10-14 17:59:22 +0000 |
|---|---|---|
| committer | Bruce Momjian | 1998-10-14 17:59:22 +0000 |
| commit | 31bca4540e7310855a51ddb9a0c54b1a03e6f7f5 (patch) | |
| tree | 79ce1e89af225b9c046c30d38bff905afef19323 | |
| parent | 6129de0b76005d22e87704bf174ee2122f42a4ee (diff) | |
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
| -rw-r--r-- | src/interfaces/ecpg/lib/Makefile.in | 8 | ||||
| -rw-r--r-- | src/interfaces/libpq++/pgenv.h | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/interfaces/ecpg/lib/Makefile.in b/src/interfaces/ecpg/lib/Makefile.in index e315a1585b4..690f7c21249 100644 --- a/src/interfaces/ecpg/lib/Makefile.in +++ b/src/interfaces/ecpg/lib/Makefile.in @@ -74,8 +74,8 @@ endif all: lib$(NAME).a $(shlib) -$(shlib): ecpglib.sho typename.sho - $(LD) $(LDFLAGS_SL) -o $@ ecpglib.sho typename.sho +$(shlib): ecpglib.sho.o typename.sho.o + $(LD) $(LDFLAGS_SL) -o $@ ecpglib.sho typename.sho.o clean: 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 typename.o : typename.c ../include/ecpgtype.h $(CC) $(CFLAGS) -I../include $(PQ_INCLUDE) -c $< -o $@ -ecpglib.sho : ecpglib.c ../include/ecpglib.h ../include/ecpgtype.h +ecpglib.sho.o : ecpglib.c ../include/ecpglib.h ../include/ecpgtype.h $(CC) $(CFLAGS) $(CFLAGS_SL) -I../include $(PQ_INCLUDE) -c $< -o $@ -typename.sho : typename.c ../include/ecpgtype.h +typename.sho.o : typename.c ../include/ecpgtype.h $(CC) $(CFLAGS) $(CFLAGS_SL) -I../include $(PQ_INCLUDE) -c $< -o $@ diff --git a/src/interfaces/libpq++/pgenv.h b/src/interfaces/libpq++/pgenv.h index 768c5d86b92..43068aacce2 100644 --- a/src/interfaces/libpq++/pgenv.h +++ b/src/interfaces/libpq++/pgenv.h @@ -20,6 +20,11 @@ #include <string> +#ifdef __sun__ +#ifndef __GNUC__ +using namespace std; +#endif +#endif // // these are the environment variables used for getting defaults |