--- a/Make.config.orig 2019-11-21 18:06:02.262699595 +0100
+++ b/Make.config 2019-11-21 18:07:51.468696109 +0100
@@ -93,14 +93,11 @@
endif
ifdef DEBUG
- CFLAGS += -ggdb -fno-stack-protector -O0
+ CFLAGS += -ggdb -fno-stack-protector -O
endif
-CFLAGS += -fPIC -Wreturn-type -Wall -Wextra -Wparentheses -Wformat -pedantic \
- -Wno-long-long -Wunused-variable -Wunused-label -Wno-unused-result \
- -Wunused-value -Wunused-function -Wno-variadic-macros -Wunused-local-typedefs \
- -Wno-unused-parameter -Werror=format-security \
- -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+CFLAGS += @@OPTFLAGS \
+ -fPIC -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
CFLAGS += -std=c++11 -D__STDC_FORMAT_MACROS
--- a/epglv/Makefile.orig 2019-11-21 15:30:23.183997755 +0100
+++ b/epglv/Makefile 2019-11-21 15:35:27.599988036 +0100
@@ -7,18 +7,16 @@
include ../Make.config
ARCH := $(shell getconf LONG_BIT)
+INCLUDEDIR := /usr/include
+LIBDIR := @@LIBDIR
ifneq (,$(findstring "arm", $(shell uname -m)))
- CPP_FLAGS_32 := -m32
- CPP_FLAGS_64 := -m64
+ CFLAGS:= @@OPTFLAGS \
+ -fPIC
endif
-CPP_FLAGS := $(CPP_FLAGS_$(ARCH)) -Wall \
- -fPIC \
- -I/usr/local/include/mysql \
- -L/usr/lib/mysql \
- -L/usr/local/lib/mysql \
- -I/usr/include/mysql \
+CPP_FLAGS := -I$(INCLUDEDIR)/mysql -fPIC \
+ -L$(LIBDIR)/mysql \
$(shell mysql_config --libs) \
-DMYSQL_DYNAMIC_PLUGIN \
-DDEBUG_MYSQL=0
@@ -32,7 +30,7 @@
all: $(TARGET)
$(TARGET): $(OBJS)
- $(CC) $(CPP_FLAGS) -pipe -O3 -shared -o $(TARGET) $(OBJS)
+ $(CC) $(CPP_FLAGS) $(CFLAGS) -shared -o $(TARGET) $(OBJS)
install: $(TARGET)
strip $(TARGET)
@@ -50,7 +48,7 @@
%.o: %.c
src/%.o: src/%.c
- $(CC) -c $(CPP_FLAGS) -pipe -O3 -shared $< -o $@
+ $(CC) -c $(CPP_FLAGS) $(CFLAGS) -shared $< -o $@
#--------------------------------------------------------
# dependencies
--- a/lib/Makefile.orig 2019-11-22 14:44:14.040245551 +0100
+++ b/lib/Makefile 2019-11-22 14:44:46.047244529 +0100
@@ -56,7 +56,7 @@
endif
ifdef DEBUG
- CFLAGS += -ggdb -O0
+ CFLAGS += -ggdb -O
endif
CFLAGS += $(shell mysql_config --include)