[med-svn] [Git][med-team/hhsuite][master] 2 commits: Fix non-x86 builds

[Michael R. Crusoe]

Michael R. Crusoe pushed to branch master at Debian Med / hhsuite


Commits:
e1aac0d7 by Michael R. Crusoe at 2020-09-01T11:37:21+02:00
Fix non-x86 builds

- - - - -
b855704c by Michael R. Crusoe at 2020-09-01T11:38:01+02:00
release 3.3.0+ds-2

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,6 +1,12 @@
-hhsuite (3.3.0+ds-1) unstable; urgency=medium
+hhsuite (3.3.0+ds-2) unstable; urgency=medium
 
   * Team upload.
+  * Fix non-x86 builds
+
+ -- Michael R. Crusoe <crusoe at debian.org>  Tue, 01 Sep 2020 11:37:48 +0200
+
+hhsuite (3.3.0+ds-1) unstable; urgency=medium
+
   * New upstream version
   * debhelper-compat 13 (routine-update)
   * Refresh patches


=====================================
debian/rules
=====================================
@@ -28,8 +28,12 @@ hhmanpages: $(HHMANPAGES)
 override_dh_installman-arch: $(HHMANPAGES)
 	dh_installman --arch
 
+ifeq (,$(filter $(DEB_HOST_ARCH),amd64 i386))
+$(HHMANPAGES): %.1 : debian/tmp/usr/bin/%
+else
 $(HHMANPAGES): %.1 : debian/hhsuite/usr/bin/%
-	unset LD_PRELOAD && export LD_LIBRARY_PATH=debian/tmp/usr/lib && export HHLIB=. && help2man --no-info --help-option '-h all' --version-string $(DEB_VERSION_UPSTREAM) -n "$$n_$*" '$<' | sed -e 's/\(^\|[^\]\)-/\1\\-/g;' > '$@'
+endif
+	export HHLIB=. && help2man --no-info --help-option '-h all' --version-string $(DEB_VERSION_UPSTREAM) -n "$$n_$*" '$<' | sed -e 's/\(^\|[^\]\)-/\1\\-/g;' > '$@'
 
 override_dh_auto_clean:
 	dh_auto_clean
@@ -42,51 +46,51 @@ override_dh_auto_configure-arch:
 ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386))
 	for SIMD in avx2 avx sse4.1 ssse3 sse3 ; do \
 		export CXXFLAGS="$(CXXFLAGS) -m$${SIMD}" && \
-		dh_auto_configure --arch --builddirectory build_$${SIMD} -- -DEXE_SUFFIX=-$${SIMD} ; \
+		dh_auto_configure --builddirectory build_$${SIMD} -- -DEXE_SUFFIX=-$${SIMD} ; \
 	done
 	export CXXFLAGS="$(CXXFLAGS)" && \
-		dh_auto_configure --arch --builddirectory build_plain -- -DEXE_SUFFIX=-plain
+		dh_auto_configure --builddirectory build_plain -- -DEXE_SUFFIX=-plain
 ifeq (i386,$(DEB_HOST_ARCH))
 	for SIMD in sse2 sse ; do \
 		export CXXFLAGS="$(CXXFLAGS) -m$${SIMD}" && \
-		dh_auto_configure --arch --builddirectory build_$${SIMD} -- -DEXE_SUFFIX=-$${SIMD} ; \
+		dh_auto_configure --builddirectory build_$${SIMD} -- -DEXE_SUFFIX=-$${SIMD} ; \
 	done
 endif
 else
-	dh_auto_configure --arch --builddirectory mybuild
+	dh_auto_configure --builddirectory mybuild
 endif
 
 override_dh_auto_configure-indep:
-	dh_auto_configure --indep --builddirectory mybuild
+	dh_auto_configure --builddirectory mybuild
 
 override_dh_auto_build-arch:
 ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386))
 	for SIMD in avx2 avx sse4.1 ssse3 sse3 plain ; do \
-		dh_auto_build --arch --builddirectory build_$${SIMD} ; \
+		dh_auto_build --builddirectory build_$${SIMD} ; \
 	done
 ifeq (i386,$(DEB_HOST_ARCH))
 	for SIMD in sse2 sse ; do \
-		dh_auto_build --arch --builddirectory build_$${SIMD} ; \
+		dh_auto_build --builddirectory build_$${SIMD} ; \
 	done
 endif
 else
-	dh_auto_build --arch --builddirectory mybuild
+	dh_auto_build --builddirectory mybuild
 endif
 
 override_dh_auto_build-indep:
-	dh_auto_build --arch --builddirectory mybuild/data
+	dh_auto_build --builddirectory mybuild/data
 
 override_dh_auto_install-arch:
 	mkdir -p $(libprefix)/bin
 ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386))
 	for SIMD in avx2 avx sse4.1 ssse3 sse3 plain ; do \
-		dh_auto_install --arch --builddirectory build_$${SIMD} ; \
+		dh_auto_install --builddirectory build_$${SIMD} ; \
 	done
 	mkdir -p $(binprefix)
 	dh_install -phhsuite debian/bin/simd-dispatch /usr/libexec/$(DEB_SOURCE)/
 ifeq (i386,$(DEB_HOST_ARCH))
 	for SIMD in sse2 sse ; do \
-		dh_auto_install --arch --builddirectory build_$${SIMD} ; \
+		dh_auto_install --builddirectory build_$${SIMD} ; \
 	done
 endif
 	for prog in $(progs) cstranslate ; do dh_install usr/bin/$${prog}* /usr/libexec/$(DEB_SOURCE)/; done
@@ -97,13 +101,13 @@ endif
 		&& for prog in cstranslate ; do \
 		ln -s ../simd-dispatch $${prog} ; done
 else
-	dh_auto_install --arch --builddirectory mybuild
-	for prog in $(prog) ; do dh_install -phhsuite usr/bin/$${prog} usr/bin/ ; done
+	dh_auto_install --builddirectory mybuild
+	for prog in $(progs) ; do dh_install -phhsuite usr/bin/$${prog} usr/bin/ ; done
 	dh_install -phhsuite usr/bin/cstranslate* usr/libexec/$(DEB_SOURCE)/bin
 endif
 
 override_dh_auto_install-indep:
-	dh_auto_install --indep --builddirectory mybuild/data
+	dh_auto_install --builddirectory mybuild/data
 
 override_dh_fixperms-arch:
 	dh_fixperms



View it on GitLab: https://salsa.debian.org/med-team/hhsuite/-/compare/572c89a4ac432d4715d053183cab57cc84b28029...b855704c8230c1b00aa6857b164eec3d0a56e863

-- 
View it on GitLab: https://salsa.debian.org/med-team/hhsuite/-/compare/572c89a4ac432d4715d053183cab57cc84b28029...b855704c8230c1b00aa6857b164eec3d0a56e863
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/20200901/bc30880d/attachment-0001.html>