115 lines
3.4 KiB
Diff
115 lines
3.4 KiB
Diff
diff --recursive -u misc/build/postgresql-9.1.1/src/interfaces/libpq/Makefile misc/build/postgresql-9.1.1.patched/src/interfaces/libpq/Makefile
|
|
--- misc/build/postgresql-9.1.1/src/interfaces/libpq/Makefile 2011-09-22 23:57:57.000000000 +0200
|
|
+++ misc/build/postgresql-9.1.1.patched/src/interfaces/libpq/Makefile 2011-12-15 09:02:18.000000000 +0100
|
|
@@ -142,3 +142,6 @@
|
|
|
|
maintainer-clean: distclean maintainer-clean-lib
|
|
rm -f libpq-dist.rc
|
|
+
|
|
+libpq-flags.mk:
|
|
+ @printf '%s\n' 'LIBPQ_DEP_LIBS+=$(SHLIB_LINK)' > '$@'
|
|
diff --recursive -u misc/build/postgresql-9.1.1/src/interfaces/libpq/win32.mak misc/build/postgresql-9.1.1.patched/src/interfaces/libpq/win32.mak
|
|
--- misc/build/postgresql-9.1.1/src/interfaces/libpq/win32.mak 2011-12-14 14:28:59.000000000 +0100
|
|
+++ misc/build/postgresql-9.1.1.patched/src/interfaces/libpq/win32.mak 2011-12-15 09:11:37.000000000 +0100
|
|
@@ -13,30 +13,29 @@
|
|
|
|
# CPU="i386" or CPU environment of nmake.exe (AMD64 or IA64)
|
|
|
|
-!IF ("$(CPU)" == "")||("$(CPU)" == "i386")
|
|
-CPU=i386
|
|
+!IF ("$(CPU)" == "")||("$(CPU)" == "I")
|
|
+MACHINE=i386
|
|
!MESSAGE Building the Win32 static library...
|
|
!MESSAGE
|
|
-!ELSEIF ("$(CPU)" == "IA64")||("$(CPU)" == "AMD64")
|
|
+!ELSEIF ("$(CPU)" == "X")
|
|
+MACHINE=AMD64
|
|
ADD_DEFINES=/D "WIN64" /Wp64 /GS
|
|
ADD_SECLIB=bufferoverflowU.lib
|
|
!MESSAGE Building the Win64 static library...
|
|
!MESSAGE
|
|
!ELSE
|
|
!MESSAGE Please check a CPU=$(CPU) ?
|
|
-!MESSAGE CPU=i386 or AMD64 or IA64
|
|
+!MESSAGE CPU=I or X
|
|
!ERROR Make aborted.
|
|
!ENDIF
|
|
|
|
!IFDEF DEBUG
|
|
-OPT=/Od /Zi /MDd
|
|
+OPT=/Od /Zi
|
|
LOPT=/DEBUG
|
|
-DEBUGDEF=/D _DEBUG
|
|
-OUTFILENAME=libpqd
|
|
+OUTFILENAME=libpq
|
|
!ELSE
|
|
OPT=/O2 /MD
|
|
LOPT=
|
|
-DEBUGDEF=/D NDEBUG
|
|
OUTFILENAME=libpq
|
|
!ENDIF
|
|
|
|
@@ -56,7 +57,7 @@
|
|
!ENDIF
|
|
|
|
!IF "$(KFW_LIB_PATH)" == ""
|
|
-KFW_LIB_PATH=C:\kfw-2.6.5\lib\$(CPU)
|
|
+KFW_LIB_PATH=C:\kfw-2.6.5\lib\$(MACHINE)
|
|
!MESSAGE Using default Kerberos Library directory: $(KFW_LIB_PATH)
|
|
!ENDIF
|
|
|
|
@@ -79,18 +80,11 @@
|
|
CPP=cl.exe
|
|
RSC=rc.exe
|
|
|
|
-!IFDEF DEBUG
|
|
-OUTDIR=.\Debug
|
|
-INTDIR=.\Debug
|
|
-CPP_OBJS=.\Debug/
|
|
-!ELSE
|
|
-OUTDIR=.\Release
|
|
-INTDIR=.\Release
|
|
-CPP_OBJS=.\Release/
|
|
-!ENDIF
|
|
-
|
|
+OUTDIR=.
|
|
+INTDIR=.
|
|
+CPP_OBJS=./
|
|
|
|
-ALL : config "$(OUTDIR)\$(OUTFILENAME).lib" "$(OUTDIR)\$(OUTFILENAME).dll"
|
|
+ALL : config "$(OUTDIR)\$(OUTFILENAME).lib"
|
|
|
|
CLEAN :
|
|
-@erase "$(INTDIR)\getaddrinfo.obj"
|
|
@@ -192,10 +186,11 @@
|
|
|
|
CPP_PROJ=/nologo /W3 /EHsc $(OPT) \
|
|
/I "..\..\include" /I "..\..\include\port\win32" /I "..\..\include\port\win32_msvc" \
|
|
- /I "..\..\port" /I. /I "$(SSL_INC)" /I "$(KFW_INC)" /I "$(MOZLDAP_INC)" \
|
|
+ /I "..\..\port" /I. $(SOLARINC) \
|
|
/D "FRONTEND" $(DEBUGDEF) \
|
|
/D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\libpq.pch" \
|
|
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \
|
|
+ /D "_CRT_NONSTDC_NO_DEPRECATE" \
|
|
/D "_CRT_SECURE_NO_DEPRECATE" $(ADD_DEFINES)
|
|
|
|
!IFDEF USE_SSL
|
|
@@ -230,7 +224,7 @@
|
|
LINK32=link.exe
|
|
LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib shfolder.lib wsock32.lib ws2_32.lib secur32.lib $(SSL_LIBS) $(LDAP_LIBS) $(KFW_LIBS) $(ADD_SECLIB) \
|
|
/nologo /subsystem:windows /dll $(LOPT) /incremental:no \
|
|
- /pdb:"$(OUTDIR)\libpqdll.pdb" /machine:$(CPU) \
|
|
+ /pdb:"$(OUTDIR)\libpqdll.pdb" /machine:$(MACHINE) \
|
|
/out:"$(OUTDIR)\$(OUTFILENAME).dll"\
|
|
/implib:"$(OUTDIR)\$(OUTFILENAME)dll.lib" \
|
|
/libpath:"$(SSL_LIB_PATH)" /libpath:"$(KFW_LIB_PATH)" /libpath:"$(MOZLDAP_LIB_PATH)" \
|
|
@@ -247,7 +241,7 @@
|
|
<<
|
|
|
|
"$(INTDIR)\libpq.res" : "$(INTDIR)" libpq-dist.rc
|
|
- $(RSC) $(RSC_PROJ) libpq-dist.rc
|
|
+ $(RSC) $(SOLARINC) $(RSC_PROJ) libpq-dist.rc
|
|
|
|
|
|
"$(OUTDIR)\$(OUTFILENAME).dll" : "$(OUTDIR)" "$(INTDIR)\libpq.res"
|
|
|