external/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,14 +11,12 @@
  13  !ENDIF
  14
  15  !IFDEF DEBUG
  16 -OPT=/Od /Zi /MDd
  17 +OPT=/Od /Zi
  18  LOPT=/DEBUG
  19 -DEBUGDEF=/D _DEBUG
  20 -OUTFILENAME=libpqd
  21 +OUTFILENAME=libpq
  22  !ELSE
  23  OPT=/O2 /MD
  24  LOPT=
  25 -DEBUGDEF=/D NDEBUG
  26  OUTFILENAME=libpq
  27  !ENDIF
  28
  29 @@ -67,18 +66,11 @@
  30  CPP=cl.exe
  31  RSC=rc.exe
  32
  33 -!IFDEF DEBUG
  34 -OUTDIR=.\Debug
  35 -INTDIR=.\Debug
  36 -CPP_OBJS=.\Debug/
  37 -!ELSE
  38 -OUTDIR=.\Release
  39 -INTDIR=.\Release
  40 -CPP_OBJS=.\Release/
  41 -!ENDIF
  42 -
  43 +OUTDIR=.
  44 +INTDIR=.
  45 +CPP_OBJS=./
  46
  47 -ALL : config "$(OUTDIR)\$(OUTFILENAME).lib" "$(OUTDIR)\$(OUTFILENAME).dll"
  48 +ALL : config "$(OUTDIR)\$(OUTFILENAME).lib"
  49
  50  CLEAN :
  51         -@erase "$(INTDIR)\getaddrinfo.obj"
  52 @@ -178,10 +170,11 @@
  53  "$(OUTDIR)" :
  54      if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
  55
  56 -CPP_PROJ=/nologo /W3 /EHsc $(OPT) /I "..\..\include" /I "..\..\include\port\win32" /I "..\..\include\port\win32_msvc" /I "..\..\port" /I. /I "$(SSL_INC)" \
  57 +CPP_PROJ=/nologo /W3 /EHsc $(OPT) /I "..\..\include" /I "..\..\include\port\win32" /I "..\..\include\port\win32_msvc" /I "..\..\port" /I. $(SOLARINC) /I $(WORKDIR)/UnpackedTarball/openssl/include \
  58   /D "FRONTEND" $(DEBUGDEF) \
  59   /D "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\libpq.pch" \
  60   /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c  \
  61 + /D "_CRT_NONSTDC_NO_DEPRECATE" \
  62   /D "_CRT_SECURE_NO_DEPRECATE" $(ADD_DEFINES)
  63
  64  !IFDEF USE_SSL
  65 @@ -222,7 +215,7 @@
  66  <<
  67
  68  "$(INTDIR)\libpq.res" : "$(INTDIR)" libpq-dist.rc
  69 -       $(RSC) $(RSC_PROJ) libpq-dist.rc
  70 +       $(RSC) $(SOLARINC) $(RSC_PROJ) libpq-dist.rc
  71
  72
  73  "$(OUTDIR)\$(OUTFILENAME).dll" : "$(OUTDIR)" "$(INTDIR)\libpq.res"
  74