[med-svn] [ncbi-entrez-direct] 01/01: 6.90.20170705+ds-2: Accommodate non-Go architectures.

[Aaron M. Ucko]

This is an automated email from the git hooks/post-receive script.

ucko pushed a commit to branch master
in repository ncbi-entrez-direct.

commit 386713d0283ba164bfe832eca13e0409cb1349c1
Author: Aaron M. Ucko <ucko at debian.org>
Date:   Thu Jul 6 22:25:06 2017 -0400

    6.90.20170705+ds-2: Accommodate non-Go architectures.
    
    debian/rules: Rework Go-related logic to accommodate builds on
    (non-release) architectures on which I've had to conditionalize out
    the relevant build dependencies.
---
 debian/changelog              |  8 ++++++++
 debian/patches/debian-changes | 16 +++++-----------
 debian/rules                  | 25 +++++++++++++++----------
 3 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 88890d2..956a4bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ncbi-entrez-direct (6.90.20170705+ds-2) unstable; urgency=medium
+
+  * debian/rules: Rework Go-related logic to accommodate builds on
+    (non-release) architectures on which I've had to conditionalize out
+    the relevant build dependencies.
+
+ -- Aaron M. Ucko <ucko at debian.org>  Thu, 06 Jul 2017 22:25:05 -0400
+
 ncbi-entrez-direct (6.90.20170705+ds-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes
index bd2168e..6e638bd 100644
--- a/debian/patches/debian-changes
+++ b/debian/patches/debian-changes
@@ -5,17 +5,11 @@ Description: <short summary of the patch>
  information below has been extracted from the changelog. Adjust it or drop
  it.
  .
- ncbi-entrez-direct (6.90.20170705+ds-1) unstable; urgency=medium
+ ncbi-entrez-direct (6.90.20170705+ds-2) unstable; urgency=medium
  .
-   * New upstream release.
-   * debian/compat: Advance to debhelper 10.
-   * debian/control:
-     - Advance debhelper build dependency accordingly.
-     - Reinstate architecture qualifiers for Go build dependencies on the
-       basis of experimental build logs.
-     - Standards-Version: 4.0.0 (already compliant).
-   * debian/man/{ftp-cp,gbf2xml}.1: Correct syntax for optional filenames.
-   * debian/man/xtract.1: Update for new release.
+   * debian/rules: Rework Go-related logic to accommodate builds on
+     (non-release) architectures on which I've had to conditionalize out
+     the relevant build dependencies.
 Author: Aaron M. Ucko <ucko at debian.org>
 
 ---
@@ -29,7 +23,7 @@ Bug-Debian: https://bugs.debian.org/<bugnumber>
 Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
 Forwarded: <no|not-needed|url proving that it has been forwarded>
 Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: 2017-07-06
+Last-Update: 2017-07-07
 
 --- /dev/null
 +++ ncbi-entrez-direct-6.90.20170705+ds/.gitignore
diff --git a/debian/rules b/debian/rules
index 7d478f3..e90250b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,13 +17,22 @@ AS_IS_SCRIPTS = amino-acid-composition between-two-genes edirutil \
 	        join-into-groups-of nquire reorder-columns sort-uniq-count* \
 	        word-at-a-time xy-plot
 
-export GOPATH = $(CURDIR)/debian/gopath
-GOLIBS = $(GOPATH)/src/golang.org/x/text
+GOCODE   = /usr/share/gocode
+GOLIBSRC = $(wildcard $(GOCODE)/src/golang.org/x/text)
 
-GOVERSION := $(word 3,$(shell go version)) # go version **goX.Y.Z** OS/CPU
-GO_IS_OLD := $(shell dpkg --compare-versions 0$(GOVERSION) ge 0go1.8 || echo $$?)
-ifneq (,$(GO_IS_OLD))
-  export PATH := /usr/lib/go-1.8/bin:$(PATH)
+ifneq (,$(GOLIBSRC))
+  export GOPATH = $(CURDIR)/debian/gopath
+  GOLIBS = $(GOLIBSRC:$(GOCODE)/%=$(GOPATH)/%)
+
+  GOVERSION := $(word 3,$(shell go version)) # go version **goX.Y.Z** OS/CPU
+  GO_IS_OLD := $(shell dpkg --compare-versions 0$(GOVERSION) ge 0go1.8 || echo $$?)
+  ifneq (,$(GO_IS_OLD))
+    export PATH := /usr/lib/go-1.8/bin:$(PATH)
+  endif
+
+  $(GOLIBS): $(GOPATH)/%: /usr/share/gocode/%
+	mkdir -p $(dir $@)
+	ln -s $< $@
 endif
 
 bin/edirect: edirect.pl
@@ -40,10 +49,6 @@ bin/esummary: bin/edirect
 	echo 'exec /usr/bin/edirect -fetch -format docsum "$$@"' >> $@
 	chmod +x $@
 
-$(GOLIBS): $(GOPATH)/%: /usr/share/gocode/%
-	mkdir -p $(dir $@)
-	ln -s $< $@
-
 override_dh_auto_build: $(WRAPPERS) $(GOLIBS)
 	dh_auto_build
 	install $(AS_IS_SCRIPTS) debian/efetch debian/einfo bin/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/ncbi-entrez-direct.git