[med-svn] [Git][med-team/ncbi-entrez-direct][master] 5 commits: Start work on ncbi-entrez-direct 14.6.20210224+dfsg-5.

[Aaron M. Ucko (@ucko)]

Aaron M. Ucko pushed to branch master at Debian Med / ncbi-entrez-direct


Commits:
d14b8a6c by Aaron M. Ucko at 2021-10-03T17:51:59-04:00
Start work on ncbi-entrez-direct 14.6.20210224+dfsg-5.

Newer upstream releases are available, and I'll look into packaging
them when I get a chance, but my immediate priorities are accommodating
Go 1.16-1.17 (#995349) and golang-github-klauspost-cpuid 2.x.

- - - - -
d611ed54 by Aaron M. Ucko at 2021-10-03T17:53:56-04:00
debian/rules: Force traditional GOPATH mode (#995349).

Export GO111MODULE=off to avoid needing to produce proper offline
go.mod and go.sum files, which turned out not to be nearly as
straightforward as I'd hoped.  It's not clear how much longer this
option will be available, but it works in 1.16 and from what I gather
even 1.17 after all.

- - - - -
b1f1c9d9 by Aaron M. Ucko at 2021-10-03T17:57:26-04:00
Substitute .../klauspost/cpuid/v2 for .../klauspost/cpuid as needed.

Conditionalize the change on the presence of a .../v2 directory, to
facilitate possible backports.

- - - - -
d0f8cd74 by Aaron M. Ucko at 2021-10-03T18:03:54-04:00
Set CGO_{C,CPP,CXX,F,LD}FLAGS from (hardened) dpkg-supplied flags.

See #951262.  CGO_CXXFLAGS is likely extraneous, and CGO_FFLAGS more
so, but they can't hurt.

- - - - -
6c457e6a by Aaron M. Ucko at 2021-10-03T20:28:47-04:00
Finalize ncbi-entrez-direct 14.6.20210224+dfsg-5 for unstable.

Urgency high because the changes are safe and for the most part
necessary for ubuilds to succeed again in unstable.

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,17 @@
+ncbi-entrez-direct (14.6.20210224+dfsg-5) unstable; urgency=high
+
+  * debian/rules:
+    - Force traditional GOPATH mode (GO111MODULE=off) to avoid needing to
+      produce proper offline go.mod and go.sum files, which turned out not
+      to be nearly as straightforward as I'd hoped.  It's not clear how
+      much longer this option will be available, but it works in 1.16 and
+      from what I gather even 1.17 after all.  (Closes: #995349.)
+    - Substitute .../klauspost/cpuid/v2 for .../klauspost/cpuid as needed.
+    - Set CGO_{C,CPP,CXX,F,LD}FLAGS from (hardened) dpkg-supplied flags.
+      (See #951262.)
+
+ -- Aaron M. Ucko <ucko at debian.org>  Sun, 03 Oct 2021 20:28:46 -0400
+
 ncbi-entrez-direct (14.6.20210224+dfsg-4) unstable; urgency=medium
 
   * debian/{efetch,einfo}: Refresh %ncbi_supported, taking care to include


=====================================
debian/rules
=====================================
@@ -6,6 +6,12 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/default.mk
 
+export CGO_CFLAGS   = $(CFLAGS)
+export CGO_CPPFLAGS = $(CPPFLAGS)
+export CGO_CXXFLAGS = $(CXXFLAGS) # probably irrelevant
+export CGO_FFLAGS   = $(FFLAGS)   # even more so
+export CGO_LDFLAGS  = $(LDFLAGS)
+
 %:
 	dh $@ --with=golang
 
@@ -47,6 +53,7 @@ GOLIBSRC_ = $(GH)/fatih/color $(GH)/gedex/inflector $(GH)/klauspost/cpuid \
             $(GL)/x/sys $(GL)/x/text
 GOLIBSRC  = $(GOLIBSRC_:%=$(GOCODE)/src/%)
 
+export GO111MODULE = off
 export GOCACHE = $(CURDIR)/go-build
 export GOPATH = $(CURDIR)/obj-$(DEB_HOST_GNU_TYPE)
 GOLIBS = $(GOLIBSRC:$(GOCODE)/%=$(GOPATH)/%)
@@ -123,6 +130,13 @@ $(GOPATH)/src/$(GH)/fiam/gounidecode: $(GOLIBS)
 	mkdir -p $(GOPATH)/src/$(GH)/fiam
 	ln -s ../rainycape $(GOPATH)/src/$(GH)/fiam/gounidecode
 
+ifneq (,$(wildcard /usr/share/gocode/src/$(GH)/klauspost/cpuid/v2))
+  $(GOPATH)/src/$(GH)/klauspost/cpuid: $(GOLIBS)
+	mkdir -p $(GOPATH)/src/$(GH)/klauspost
+	ln -s /usr/share/gocode/src/$(GH)/klauspost/cpuid/v2 \
+	    $(GOPATH)/src/$(GH)/klauspost/cpuid
+endif
+
 COMMON = common.go
 $(BIN_GO_APPS): bin/%: %.go $(GOPATH)/src/$(GH)/fiam/gounidecode
 # Always use gccgo?  The resulting binary would be much smaller, but



View it on GitLab: https://salsa.debian.org/med-team/ncbi-entrez-direct/-/compare/1520ff4905c64ad7badad55eb36596acef4b53a7...6c457e6a1b0794cd23bdded9f6be643611be3003

-- 
View it on GitLab: https://salsa.debian.org/med-team/ncbi-entrez-direct/-/compare/1520ff4905c64ad7badad55eb36596acef4b53a7...6c457e6a1b0794cd23bdded9f6be643611be3003
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20211004/4107ae7f/attachment-0001.htm>