|
 |
e71c8ce |
--- a/Make.config.orig 2023-02-12 16:14:53.251507555 +0100
|
|
|
e71c8ce |
+++ b/Make.config 2023-02-12 16:19:44.765676147 +0100
|
|
|
e71c8ce |
@@ -113,14 +113,11 @@
|
|
Martin Gansser |
cc3b7e5 |
endif
|
|
|
c8f4edd |
|
|
|
bb46d2e |
ifdef DEBUG
|
|
|
bb46d2e |
- CFLAGS += -ggdb -fno-stack-protector -O0
|
|
|
bb46d2e |
+ CFLAGS += -ggdb -fno-stack-protector -O
|
|
|
bb46d2e |
endif
|
|
|
c8f4edd |
|
|
|
e71c8ce |
-CFLAGS += -std=c++17 -D__STDC_FORMAT_MACROS
|
|
|
e71c8ce |
-CFLAGS += -fPIC -Wall -Wreturn-type -Wformat -Wextra -Wparentheses -pedantic -Werror=format-security \
|
|
|
e71c8ce |
- -Wunused-variable -Wunused-label -Wunused-value -Wunused-function -Wunused-local-typedefs \
|
|
|
e71c8ce |
- -Wno-unused-parameter
|
|
|
e71c8ce |
-CFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
|
|
Martin Gansser |
cc3b7e5 |
+CFLAGS += @@OPTFLAGS \
|
|
|
e71c8ce |
+ -fPIC -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
|
|
|
c8f4edd |
|
|
|
81e01fa |
ifdef USE_CLANG
|
|
|
81e01fa |
CFLAGS += -x c++ -Wunused-const-variable
|
|
|
81e01fa |
--- vdr-epg-daemon-1.2.2/epglv/Makefile.orig 2022-01-04 17:16:18.395004606 +0100
|
|
|
81e01fa |
+++ vdr-epg-daemon-1.2.2/epglv/Makefile 2022-01-04 17:19:19.243026098 +0100
|
|
|
81e01fa |
@@ -7,14 +7,16 @@
|
|
Martin Gansser |
732e88b |
include ../Make.config
|
|
Martin Gansser |
cc3b7e5 |
|
|
Martin Gansser |
cc3b7e5 |
ARCH := $(shell getconf LONG_BIT)
|
|
Martin Gansser |
cc3b7e5 |
+INCLUDEDIR := /usr/include
|
|
Martin Gansser |
cc3b7e5 |
+LIBDIR := @@LIBDIR
|
|
Martin Gansser |
cc3b7e5 |
|
|
Martin Gansser |
cc3b7e5 |
ifneq (,$(findstring "arm", $(shell uname -m)))
|
|
Martin Gansser |
cc3b7e5 |
- CPP_FLAGS_32 := -m32
|
|
Martin Gansser |
cc3b7e5 |
- CPP_FLAGS_64 := -m64
|
|
Martin Gansser |
cc3b7e5 |
+ CFLAGS:= @@OPTFLAGS \
|
|
Martin Gansser |
cc3b7e5 |
+ -fPIC
|
|
Martin Gansser |
cc3b7e5 |
endif
|
|
Martin Gansser |
cc3b7e5 |
|
|
|
81e01fa |
CPP_FLAGS := $(CPP_FLAGS_$(ARCH)) -Wall \
|
|
Martin Gansser |
cc3b7e5 |
- -fPIC \
|
|
|
81e01fa |
+ -fPIC -L$(LIBDIR)/mariadb \
|
|
|
beb56c7 |
$(shell $(SQLCFG) --libs) \
|
|
|
beb56c7 |
$(shell $(SQLCFG) --include) \
|
|
Martin Gansser |
cc3b7e5 |
-DMYSQL_DYNAMIC_PLUGIN \
|
|
|
81e01fa |
@@ -29,7 +31,7 @@
|
|
Martin Gansser |
cc3b7e5 |
all: $(TARGET)
|
|
Martin Gansser |
cc3b7e5 |
|
|
Martin Gansser |
cc3b7e5 |
$(TARGET): $(OBJS)
|
|
Martin Gansser |
cc3b7e5 |
- $(CC) $(CPP_FLAGS) -pipe -O3 -shared -o $(TARGET) $(OBJS)
|
|
Martin Gansser |
cc3b7e5 |
+ $(CC) $(CPP_FLAGS) $(CFLAGS) -shared -o $(TARGET) $(OBJS)
|
|
Martin Gansser |
cc3b7e5 |
|
|
Martin Gansser |
cc3b7e5 |
install: $(TARGET)
|
|
Martin Gansser |
cc3b7e5 |
strip $(TARGET)
|
|
|
81e01fa |
@@ -47,7 +49,7 @@
|
|
Martin Gansser |
cc3b7e5 |
|
|
Martin Gansser |
cbde17b |
%.o: %.c
|
|
Martin Gansser |
cc3b7e5 |
src/%.o: src/%.c
|
|
Martin Gansser |
cc3b7e5 |
- $(CC) -c $(CPP_FLAGS) -pipe -O3 -shared $< -o $@
|
|
|
81e01fa |
+ $(CC) -c $(CPP_FLAGS) $(CFLAGS) -shared $< -o $@
|
|
Martin Gansser |
cc3b7e5 |
|
|
Martin Gansser |
cc3b7e5 |
#--------------------------------------------------------
|
|
Martin Gansser |
cc3b7e5 |
# dependencies
|
|
|
beb56c7 |
--- a/lib/Makefile.orig 2022-01-04 08:40:01.364369134 +0100
|
|
|
beb56c7 |
+++ b/lib/Makefile 2022-01-04 08:41:15.619377959 +0100
|
|
|
bb46d2e |
@@ -56,7 +56,7 @@
|
|
|
bb46d2e |
endif
|
|
|
bb46d2e |
|
|
|
bb46d2e |
ifdef DEBUG
|
|
|
bb46d2e |
- CFLAGS += -ggdb -O0
|
|
|
bb46d2e |
+ CFLAGS += -ggdb -O
|
|
|
bb46d2e |
endif
|
|
|
bb46d2e |
|
|
|
beb56c7 |
CFLAGS += $(shell $(SQLCFG) --include)
|