[Libreoffice-commits] core.git: external/firebird

[Lionel Elie Mamane]

 external/firebird/firebird-cygwin-msvc.patch |   31 +--------------------------
 1 file changed, 2 insertions(+), 29 deletions(-)

New commits:
commit 2a871f0f24de805d8d11ae75a896004a5e522b8e
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Wed Aug 17 19:51:41 2016 +0200

    firebird: fixup cloop on Windows
    
    newly added patch was already essentially included in firebird-cygwin-msvc.patch
    
    Change-Id: Ibb4d17ced8fd58dd46ff8ca54c8a0d9d0422345e

diff --git a/external/firebird/firebird-cygwin-msvc.patch b/external/firebird/firebird-cygwin-msvc.patch
index 10c1dfe..3e769c8 100644
--- a/external/firebird/firebird-cygwin-msvc.patch
+++ b/external/firebird/firebird-cygwin-msvc.patch
@@ -532,17 +532,7 @@ diff -ur extern/btyacc/Makefile extern/btyacc/Makefile
  #define DLL_EXPORT __declspec(dllexport)
 --- extern/cloop/Makefile	2016-07-07 15:56:28.279136300 +0200
 +++ extern/cloop/Makefile	2016-07-13 16:22:38.493479800 +0200
-@@ -4,15 +4,15 @@
- 
- TARGET	:= release
- 
--CC	:= gcc
--CXX	:= g++
--LD	:= $(CXX)
-+#CC	:= gcc
-+#CXX	:= g++
-+#LD	:= $(CXX)
- 
+@@ -11,8 +11,8 @@
  SRC_DIR		:= src
  BUILD_DIR	:= build
  OUT_DIR		:= output
@@ -553,7 +543,7 @@ diff -ur extern/btyacc/Makefile extern/btyacc/Makefile
  
  OBJ_DIR := $(BUILD_DIR)/$(TARGET)
  BIN_DIR := $(OUT_DIR)/$(TARGET)/bin
-@@ -27,17 +27,17 @@
+@@ -27,7 +27,7 @@
  OBJS_C := $(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.o,$(SRCS_C))
  OBJS_CPP := $(patsubst $(SRC_DIR)/%.cpp,$(OBJ_DIR)/%.o,$(SRCS_CPP))
  
@@ -562,23 +552,6 @@ diff -ur extern/btyacc/Makefile extern/btyacc/Makefile
  CXX_FLAGS := $(C_FLAGS)
  FPC_FLAGS := -Mdelphi
  
--ifeq ($(TARGET),release)
--	CXX_FLAGS += -O3
--endif
--
--ifeq ($(TARGET),debug)
--	FPC_FLAGS += -g
--endif
-+#ifeq ($(TARGET),release)
-+#	CXX_FLAGS += -O3
-+#endif
-+
-+#ifeq ($(TARGET),debug)
-+#	FPC_FLAGS += -g
-+#endif
- 
- vpath %.c $(SRC_DIRS)
- vpath %.cpp $(SRC_DIRS)
 @@ -53,7 +53,7 @@
  .PHONY: all mkdirs clean