postgresql/postgresql-9.1.1-libreoffice.patch

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