File pihole-ftl-makefile-changes.patch of Package pihole-ftl

Overview Repositories Revisions Requests Users Attributes Meta

File pihole-ftl-makefile-changes.patch of Package pihole-ftl (Revision 0c1b5949f8936bca4c9ae759f6e5cf63)

Currently displaying revision 0c1b5949f8936bca4c9ae759f6e5cf63 , Show latest

Index: FTL-4.3.1/Makefile
===================================================================
--- FTL-4.3.1.orig/Makefile
+++ FTL-4.3.1/Makefile
@@ -20,11 +20,11 @@ DNSMASQDEPS = config.h dhcp-protocol.h d
 DNSMASQOBJ = arp.o dbus.o domain.o lease.o outpacket.o rrfilter.o auth.o dhcp6.o edns0.o log.o poll.o slaac.o blockdata.o dhcp.o forward.o loop.o radv.o tables.o bpf.o dhcp-common.o helper.o netlink.o rfc1035.o tftp.o cache.o dnsmasq.o inotify.o network.o rfc2131.o util.o conntrack.o dnssec.o ipset.o option.o rfc3315.o crypto.o dump.o ubus.o metrics.o
 
 # Get git commit version and date
-GIT_BRANCH := $(shell git branch | sed -n 's/^\* //p')
-GIT_HASH := $(shell git --no-pager describe --always --dirty)
-GIT_VERSION := $(shell git --no-pager describe --tags --always --dirty)
-GIT_DATE := $(shell git --no-pager show --date=short --format="%ai" --name-only | head -n 1)
-GIT_TAG := $(shell git describe --tags --abbrev=0)
+#GIT_BRANCH := $(shell git branch | sed -n 's/^\* //p')
+#GIT_HASH := $(shell git --no-pager describe --always --dirty)
+#GIT_VERSION := $(shell git --no-pager describe --tags --always --dirty)
+#GIT_DATE := $(shell git --no-pager show --date=short --format="%ai" --name-only | head -n 1)
+#GIT_TAG := $(shell git describe --tags --abbrev=0)
 
 # Is compiler at least gcc version 8? We cannot do ifgt in Makefile, so we use the shell expr command
 GCCVERSION8 := $(shell expr `$(CC) -dumpversion | cut -f1 -d.` \>= 8)
@@ -98,7 +98,8 @@ CCFLAGS=-std=gnu11 -I$(IDIR) $(WARNFLAGS
 # for dnsmasq we need the nettle crypto library and the gmp maths library
 # We link the two libraries statically. Although this increases the binary file size by about 1 MB, it saves about 5 MB of shared libraries and makes deployment easier
 #LIBS=-pthread -lnettle -lgmp -lhogweed
-LIBS=-pthread -lrt -Wl,-Bstatic -L/usr/local/lib -lhogweed -lgmp -lnettle -Wl,-Bdynamic
+LIBDIR +=
+LIBS=-pthread -lrt -lhogweed -lgmp -lnettle
 # Flags for compiling with libidn : -lidn
 # Flags for compiling with libidn2: -lidn2
 
@@ -139,14 +140,14 @@ clean:
 
 # # recreate version.h when GIT_VERSION changes, uses temporary file version~
 version~: force
-	@echo '$(GIT_BRANCH) $(GIT_VERSION) $(GIT_DATE) $(GIT_TAG)' | cmp -s - $@ || echo '$(GIT_BRANCH) $(GIT_VERSION) $(GIT_DATE) $(GIT_TAG)' > $@
+#	@echo '$(GIT_BRANCH) $(GIT_VERSION) $(GIT_DATE) $(GIT_TAG)' | cmp -s - $@ || echo '$(GIT_BRANCH) $(GIT_VERSION) $(GIT_DATE) $(GIT_TAG)' > $@
 version.h: version~
-	@echo '#define GIT_VERSION "$(GIT_VERSION)"' > "$@"
-	@echo '#define GIT_DATE "$(GIT_DATE)"' >> "$@"
-	@echo '#define GIT_BRANCH "$(GIT_BRANCH)"' >> "$@"
-	@echo '#define GIT_TAG "$(GIT_TAG)"' >> "$@"
-	@echo '#define GIT_HASH "$(GIT_HASH)"' >> "$@"
-	@echo "Making FTL version on branch $(GIT_BRANCH) - $(GIT_VERSION) ($(GIT_DATE))"
+#	@echo '#define GIT_VERSION "$(GIT_VERSION)"' > "$@"
+#	@echo '#define GIT_DATE "$(GIT_DATE)"' >> "$@"
+#	@echo '#define GIT_BRANCH "$(GIT_BRANCH)"' >> "$@"
+#	@echo '#define GIT_TAG "$(GIT_TAG)"' >> "$@"
+#	@echo '#define GIT_HASH "$(GIT_HASH)"' >> "$@"
+#	@echo "Making FTL version on branch $(GIT_BRANCH) - $(GIT_VERSION) ($(GIT_DATE))"
 
 prefix=/usr

Places

File pihole-ftl-makefile-changes.patch of Package pihole-ftl (Revision 0c1b5949f8936bca4c9ae759f6e5cf63)

Places