File pihole10-Makefile-changes.patch of Package pihole

Overview Repositories Revisions Requests Users Attributes Meta

File pihole10-Makefile-changes.patch of Package pihole

diff -Naur a/Makefile b/Makefile
--- a/Makefile	2018-08-05 15:40:30.000000000 -0500
+++ b/Makefile	2018-09-09 12:47:35.520545344 -0500
@@ -20,11 +20,11 @@
 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
 
 # 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)
 
 # -fstack-protector: The program will be resistant to having its stack overflowed
 # -D_FORTIFY_SOURCE=2 and -O1 or higher: This causes certain unsafe glibc functions to be replaced with their safer counterparts
@@ -50,8 +50,9 @@
 # for FTL we need the pthread library
 # for dnsmasq we need the nettle crypto library and the gmp maths library
 # We link the two libraries statically. Althougth 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 -Wl,-Bstatic -L/usr/local/lib -lhogweed -lgmp -lnettle  -Wl,-Bdynamic
+LIBDIR +=
+#LIBS=-pthread -L$(LIBDIR) -lnettle -lgmp -lhogweed
+LIBS=-pthread -Wl,-Bstatic -L$(LIBDIR) -lhogweed -lgmp -lnettle  -Wl,-Bdynamic
 # Flags for compiling with libidn : -lidn
 # Flags for compiling with libidn2: -lidn2
 
@@ -99,15 +100,15 @@
 	rm -f $(ODIR)/*.o $(DNSMASQODIR)/*.o pihole-FTL
 
 # # 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)' > $@
-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))"
+#version~: force
+#	@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))"
 
 prefix=/usr

Places

File pihole10-Makefile-changes.patch of Package pihole

Places