postgresql/postgresql-9.2.1-libreoffice.patch

   1 --- misc/build/postgresql-9.1.1/src/interfaces/libpq/Makefile   2011-09-22 23:57:57.000000000 +0200
   2 +++ misc/build/postgresql-9.1.1.patched/src/interfaces/libpq/Makefile   2011-12-15 09:02:18.000000000 +0100
   3 @@ -148,3 +148,6 @@
   4  maintainer-clean: distclean maintainer-clean-lib
   5         $(MAKE) -C test $@
   6         rm -f libpq-dist.rc
   7 +
   8 +libpq-flags.mk:
   9 +       @printf '%s\n' 'LIBPQ_DEP_LIBS+=$(SHLIB_LINK)' > '$@'
  10 --- misc/build/postgresql-9.1.1/src/interfaces/libpq/win32.mak  2011-12-14 14:28:59.000000000 +0100
  11 +++ misc/build/postgresql-9.1.1.patched/src/interfaces/libpq/win32.mak  2011-12-15 09:11:37.000000000 +0100
  12 @@ -11,30 +11,29 @@
  13
  14  # CPU="i386" or CPU environment of nmake.exe (AMD64 or IA64)
  15
  16 -!IF ("$(CPU)" == "")||("$(CPU)" == "i386")
  17 -CPU=i386
  18 +!IF ("$(CPU)" == "")||("$(CPU)" == "I")
  19 +MACHINE=i386
  20  !MESSAGE Building the Win32 static library...
  21  !MESSAGE
  22 -!ELSEIF ("$(CPU)" == "IA64")||("$(CPU)" == "AMD64")
  23 +!ELSEIF ("$(CPU)" == "X")
  24 +MACHINE=AMD64
  25  ADD_DEFINES=/D "WIN64" /Wp64 /GS
  26  ADD_SECLIB=bufferoverflowU.lib
  27  !MESSAGE Building the Win64 static library...
  28  !MESSAGE
  29  !ELSE
  30  !MESSAGE Please check a CPU=$(CPU) ?
  31 -!MESSAGE CPU=i386 or AMD64 or IA64
  32 +!MESSAGE CPU=I or X
  33  !ERROR Make aborted.
  34  !ENDIF
  35
  36  !IFDEF DEBUG
  37 -OPT=/Od /Zi /MDd
  38 +OPT=/Od /Zi
  39  LOPT=/DEBUG
  40 -DEBUGDEF=/D _DEBUG
  41 -OUTFILENAME=libpqd
  42 +OUTFILENAME=libpq
  43  !ELSE
  44  OPT=/O2 /MD
  45  LOPT=
  46 -DEBUGDEF=/D NDEBUG
  47  OUTFILENAME=libpq
  48  !ENDIF
  49
  50 @@ -54,7 +53,7 @@
  51  !ENDIF
  52
  53  !IF "$(KFW_LIB_PATH)" == ""
  54 -KFW_LIB_PATH=C:\kfw-2.6.5\lib\$(CPU)
  55 +KFW_LIB_PATH=C:\kfw-2.6.5\lib\$(MACHINE)
  56  !MESSAGE Using default Kerberos Library directory: $(KFW_LIB_PATH)
  57  !ENDIF
  58
  59 @@ -67,18 +66,11 @@
  60  CPP=cl.exe
  61  RSC=rc.exe
  62
  63 -!IFDEF DEBUG
  64 -OUTDIR=.\Debug
  65 -INTDIR=.\Debug
  66 -CPP_OBJS=.\Debug/
  67 -!ELSE
  68 -OUTDIR=.\Release
  69 -INTDIR=.\Release
  70 -CPP_OBJS=.\Release/
  71 -!ENDIF
  72 -
  73 +OUTDIR=.
  74 +INTDIR=.
  75 +CPP_OBJS=./
  76
  77 -ALL : config "$(OUTDIR)\$(OUTFILENAME).lib" "$(OUTDIR)\$(OUTFILENAME).dll"
  78 +ALL : config "$(OUTDIR)\$(OUTFILENAME).lib"
  79
  80  CLEAN :
  81         -@erase "$(INTDIR)\getaddrinfo.obj"
  82 @@ -178,10 +170,11 @@
  83  "$(OUTDIR)" :
  84      if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
  85
  86 -CPP_PROJ=/nologo /W3 /EHsc $(OPT) /I "..\..\include" /I "..\..\include\port\win32" /I "..\..\include\port\win32_msvc" /I "..\..\port" /I. /I "$(SSL_INC)" \
  87 +CPP_PROJ=/nologo /W3 /EHsc $(OPT) /I "..\..\include" /I "..\..\include\port\win32" /I "..\..\include\port\win32_msvc" /I "..\..\port" /I. $(SOLARINC) \
  88   /D "FRONTEND" $(DEBUGDEF) \
  89   /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\libpq.pch" \
  90   /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c  \
  91 + /D "_CRT_NONSTDC_NO_DEPRECATE" \
  92   /D "_CRT_SECURE_NO_DEPRECATE" $(ADD_DEFINES)
  93
  94  !IFDEF USE_SSL
  95 @@ -205,7 +198,7 @@
  96  LINK32=link.exe
  97  LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib shfolder.lib wsock32.lib ws2_32.lib secur32.lib $(SSL_LIBS)  $(KFW_LIB) $(ADD_SECLIB) \
  98   /nologo /subsystem:windows /dll $(LOPT) /incremental:no \
  99 - /pdb:"$(OUTDIR)\libpqdll.pdb" /machine:$(CPU) \
 100 + /pdb:"$(OUTDIR)\libpqdll.pdb" /machine:$(MACHINE) \
 101   /out:"$(OUTDIR)\$(OUTFILENAME).dll"\
 102   /implib:"$(OUTDIR)\$(OUTFILENAME)dll.lib"  \
 103   /libpath:"$(SSL_LIB_PATH)" /libpath:"$(KFW_LIB_PATH)" \
 104 @@ -222,7 +215,7 @@
 105  <<
 106
 107  "$(INTDIR)\libpq.res" : "$(INTDIR)" libpq-dist.rc
 108 -       $(RSC) $(RSC_PROJ) libpq-dist.rc
 109 +       $(RSC) $(SOLARINC) $(RSC_PROJ) libpq-dist.rc
 110
 111
 112  "$(OUTDIR)\$(OUTFILENAME).dll" : "$(OUTDIR)" "$(INTDIR)\libpq.res"
 113