ports/net/geoipupdate/files/patch-Makefile
Dmitri Goutnik fbfb650d72 net/geoipupdate: switch to USES=go:modules
Switch to USES=go:modules and pass GO_ENV down to make in preparation for the
upcoming go1.16 release.

PR:		251268
Approved by:	adamw (maintainer)
2020-11-22 22:39:02 +00:00

19 lines
974 B
Text

--- Makefile.orig 2020-10-28 21:03:38 UTC
+++ Makefile
@@ -41,7 +41,7 @@ $(BUILDDIR):
mkdir -p $(BUILDDIR)
$(BUILDDIR)/geoipupdate: $(BUILDDIR)
- (cd cmd/geoipupdate && go build -ldflags '-X main.defaultConfigFile=$(CONFFILE) -X main.defaultDatabaseDirectory=$(DATADIR) -X "main.version=$(VERSION)"')
+ (cd cmd/geoipupdate && go build -mod=vendor -ldflags '-X main.defaultConfigFile=$(CONFFILE) -X main.defaultDatabaseDirectory=$(DATADIR) -X "main.version=$(VERSION)"')
cp cmd/geoipupdate/geoipupdate $(BUILDDIR)
$(BUILDDIR)/GeoIP.conf: $(BUILDDIR) conf/GeoIP.conf.default
@@ -54,7 +54,6 @@ $(BUILDDIR)/geoipupdate.md: $(BUILDDIR) doc/geoipupdat
sed -e 's|CONFFILE|$(CONFFILE)|g' -e 's|DATADIR|$(DATADIR)|g' -e 's|$$|$(MAYBE_CR)|g' doc/geoipupdate.md > $(BUILDDIR)/geoipupdate.md
$(BUILDDIR)/GeoIP.conf.5: $(BUILDDIR)/GeoIP.conf.md $(BUILDDIR)/geoipupdate.md
- dev-bin/make-man-pages.pl "$(BUILDDIR)"
$(BUILDDIR)/geoipupdate.1: $(BUILDDIR)/GeoIP.conf.5