[med-svn] [Git][med-team/last-align][master] enable cross building

[Michael R. Crusoe]

Michael R. Crusoe pushed to branch master at Debian Med / last-align


Commits:
ca006023 by Michael R. Crusoe at 2020-04-20T10:20:02+02:00
enable cross building

- - - - -


3 changed files:

- debian/changelog
- debian/patches/simde
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+last-align (1060-4) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Enable cross-building
+
+ -- Michael R. Crusoe <michael.crusoe at gmail.com>  Mon, 20 Apr 2020 07:22:34 +0200
+
 last-align (1060-3) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/simde
=====================================
@@ -199,7 +199,9 @@ equivalents automatically
  	SimdInt y = simdSub(simdLoad(y1+i), mDelGrowCost);
 --- last-align.orig/makefile
 +++ last-align/makefile
-@@ -2,15 +2,24 @@
+@@ -1,16 +1,25 @@
+-CXXFLAGS = -msse4 -O3 -std=c++11 -pthread -DHAS_CXX_THREADS
++CXXFLAGS += -O3 -std=c++11 -pthread -DHAS_CXX_THREADS
  all:
  	@cd src && $(MAKE) CXXFLAGS="$(CXXFLAGS)"
  
@@ -229,7 +231,15 @@ equivalents automatically
  	@cd src && $(MAKE) clean
 --- last-align.orig/src/makefile
 +++ last-align/src/makefile
-@@ -57,8 +57,10 @@
+@@ -1,6 +1,5 @@
+-CXXFLAGS = -O3 -Wall -Wextra -Wcast-qual -Wswitch-enum -Wundef	\
++CXXFLAGS += -O3 -Wall -Wextra -Wcast-qual -Wswitch-enum -Wundef	\
+ -Wcast-align -pedantic -g
+-CXXFLAGS += -msse4
+ CXXFLAGS += -std=c++11
+ CXXFLAGS += -pthread -DHAS_CXX_THREADS
+ # -Wconversion
+@@ -57,8 +56,10 @@
  
  MBOBJ = last-merge-batches.o
  
@@ -242,7 +252,7 @@ equivalents automatically
  
  indexObj8 = $(indexObj4:.o=.o8)
  alignObj8 = $(alignObj4:.o=.o8)
-@@ -67,33 +69,33 @@
+@@ -67,33 +68,33 @@
  all: $(ALL)
  
  indexAllObj4 = $(indexObj0) $(indexObj4)


=====================================
debian/rules
=====================================
@@ -13,18 +13,12 @@ mandir=$(prefix)/share/man/man1
 libexecdir=$(prefix)/lib/$(DEB_SOURCE)
 
 # Copy and extend upstream CXXFLAGS here because makefile enables only overriding them
-CXXFLAGS += -Wall -Wextra -Wcast-qual -Wswitch-enum -Wundef -Wcast-align -Wno-long-long -ansi -pedantic -std=c++11 -fopenmp-simd -O3
-CPPFLAGS += -DHAS_CXX_THREADS -DSIMDE_ENABLE_OPENMP
+export DEB_CXXFLAGS_MAINT_APPEND += -Wall -Wextra -Wcast-qual -Wswitch-enum -Wundef -Wcast-align -Wno-long-long -ansi -pedantic -std=c++11 -fopenmp-simd -O3
+export DEB_CPPFLAGS_MAINT_APPEND += -DHAS_CXX_THREADS -DSIMDE_ENABLE_OPENMP
 # -Wconversion
 # -fomit-frame-pointer ?
 
-LDFLAGS += -pthread
-
-NUMJOBS = 1
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-  NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-  MAKEFLAGS += -j$(NUMJOBS)
-endif
+export DEB_LDFLAGS_MAINT_APPEND += -pthread
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
@@ -38,7 +32,8 @@ ifeq (amd64,$(DEB_HOST_ARCH))
 	mkdir -p $(prefix)
 	mkdir -p $(libexecdir)
 	for SIMD in avx2 avx sse4.1 ssse3 sse3 sse2 ; do \
-		$(MAKE) -j$(NUMJOBS) all SFX=-$${SIMD} CXXFLAGS="$(CXXFLAGS) -m$${SIMD}" CFLAGS="$(CFLAGS) -m$${SIMD}" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" ; \
+		export CXXFLAGS="$(CXXFLAGS) -m$${SIMD}" && export CFLAGS="$(CFLAGS) -m$${SIMD}" && \
+		dh_auto_make -- all SFX=-$${SIMD}  ; \
 		find . -name '*.o' -delete ; \
 		find . -name '*.o8' -delete ; \
 	done
@@ -46,13 +41,14 @@ else ifeq (i386,$(DEB_HOST_ARCH))
 	mkdir -p $(prefix)
 	mkdir -p $(libexecdir)
 	for SIMD in ssse3 sse3 sse2 sse mmx; do \
-		$(MAKE) -j$(NUMJOBS) all SFX=-$${SIMD} CXXFLAGS="$(CXXFLAGS) -m$${SIMD}" CFLAGS="$(CFLAGS) -m$${SIMD}" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" ; \
+		export CXXFLAGS="$(CXXFLAGS) -m$${SIMD}" && export CFLAGS="$(CFLAGS) -m$${SIMD}" && \
+		dh_auto_make -- all SFX=-$${SIMD}  ; \
 		find . -name '*.o' -delete ; \
 		find . -name '*.o8' -delete ; \
 	done
-	$(MAKE) -j$(NUMJOBS) all SFX=-plain CXXFLAGS="$(CXXFLAGS)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
+	export CXXFLAGS="$(CXXFLAGS) -m$${SIMD}" && export CFLAGS="$(CFLAGS) -m$${SIMD}" && dh_auto_make -- all SFX=-plain
 else
-	$(MAKE) -j$(NUMJOBS) all CXXFLAGS="$(CXXFLAGS)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
+	dh_auto_build
 endif
 
 HELP2MAN = help2man --no-info --version-string="$(DEB_VERSION_UPSTREAM)"



View it on GitLab: https://salsa.debian.org/med-team/last-align/-/commit/ca006023c18783e53f518168e4a44c068c1cbd6d

-- 
View it on GitLab: https://salsa.debian.org/med-team/last-align/-/commit/ca006023c18783e53f518168e4a44c068c1cbd6d
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/20200420/ee3012a9/attachment-0001.html>