summaryrefslogtreecommitdiffstats
path: root/cloop-honour-build-flags.patch
diff options
context:
space:
mode:
authorPhilippe Makowski <philippe.makowski@rtech.fr>2016-02-28 13:58:44 +0100
committerPhilippe Makowski <philippe.makowski@rtech.fr>2016-02-28 13:58:44 +0100
commitfa714383a8835a4893d9dda71316db7d40903bb7 (patch)
treed2cc57236c5e71756bef48f691b5f3dfbd121ffe /cloop-honour-build-flags.patch
parent7b1917d04f24abe389f233cdd9ff8372bd4de373 (diff)
downloadfirebird3-fa714383a8835a4893d9dda71316db7d40903bb7.tar.gz
firebird3-fa714383a8835a4893d9dda71316db7d40903bb7.tar.xz
firebird3-fa714383a8835a4893d9dda71316db7d40903bb7.zip
fix build with Debian patches
Diffstat (limited to 'cloop-honour-build-flags.patch')
-rw-r--r--cloop-honour-build-flags.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/cloop-honour-build-flags.patch b/cloop-honour-build-flags.patch
new file mode 100644
index 0000000..1f556e0
--- /dev/null
+++ b/cloop-honour-build-flags.patch
@@ -0,0 +1,27 @@
+Description: make cloop build honor compiler/linker flags from the environment
+Author: Damyan Ivanov <dmn@debian.org>
+Forwarded: no
+
+--- a/extern/cloop/Makefile
++++ b/extern/cloop/Makefile
+@@ -6,7 +6,7 @@ TARGET := release
+
+ CC := gcc
+ CXX := g++
+-LD := $(CXX)
++LD := $(CXX) $(LDFLAGS)
+
+ SRC_DIR := src
+ BUILD_DIR := build
+@@ -27,8 +27,9 @@ SRCS_CPP := $(foreach sdir,$(SRC_DIRS),$
+ OBJS_C := $(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.o,$(SRCS_C))
+ OBJS_CPP := $(patsubst $(SRC_DIR)/%.cpp,$(OBJ_DIR)/%.o,$(SRCS_CPP))
+
+-C_FLAGS := -ggdb -fPIC -MMD -MP -W -Wall -Wno-unused-parameter
+-CXX_FLAGS := $(C_FLAGS)
++COMMON_C_FLAGS := -ggdb -fPIC -MMD -MP -W -Wall -Wno-unused-parameter
++C_FLAGS := $(COMMON_C_FLAGS) $(CFLAGS) $(CPPFLAGS)
++CXX_FLAGS := $(COMMON_C_FLAGS) $(CXXFLAGS) $(CPPFLAGS)
+ FPC_FLAGS := -Mdelphi
+
+ ifeq ($(TARGET),release)