[med-svn] [Git][med-team/unifrac-tools][master] 2 commits: Update baseline.patch

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / unifrac-tools


Commits:
ab291601 by Adrian Bunk at 2023-07-26T04:11:42+03:00
Update baseline.patch

- - - - -
bd6f8760 by Andreas Tille at 2023-07-26T04:44:31+00:00
Merge branch 'master' into 'master'

Fix baseline violation on amd64 and FTBFS everywhere else

See merge request med-team/unifrac-tools!1
- - - - -


1 changed file:

- debian/patches/baseline.patch


Changes:

=====================================
debian/patches/baseline.patch
=====================================
@@ -2,17 +2,57 @@ Description: fix multiple ftbfs on non-amd64 and baseline violation.
 Author: Étienne Mollier <emollier at debian.org>
 Bug-Debian: https://bugs.debian.org/1021115
 Forwarded: not-needed
-Last-Update: 2022-10-02
+Last-Update: 2023-07-26
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -92,7 +92,7 @@ ifneq ($(BUILD_FULL_OPTIMIZATION),False)
- 		CPPFLAGS += -march=haswell -mtune=znver2
- 	   endif
- 	else
--		CPPFLAGS += -march=native -mtune=native
-+		CPPFLAGS += -march=native -mavx -mfma
- 	endif
-     endif
+--- unifrac-tools-1.3.2.orig/src/Makefile
++++ unifrac-tools-1.3.2/src/Makefile
+@@ -44,7 +44,7 @@ ifeq ($(PLATFORM),Darwin)
  else
+ 	AVX2 := $(shell grep "^flags" /proc/cpuinfo | head -n 1 | grep -c avx2)
+ 	LDDFLAGS = -shared
+-	BLASLIB += -lgfortran -lquadmath
++	BLASLIB += -lgfortran
+ endif
+ 
+ EXEFLAGS =
+@@ -77,39 +77,6 @@ ifndef NOGPU
+ 	endif
+ endif
+ 
+-ifneq ($(BUILD_FULL_OPTIMIZATION),False)
+-    ifneq (,$(findstring pgi,$(COMPILER)))
+-	ifeq ($(PERFORMING_CONDA_BUILD),True)
+-		# enable avx2
+-		CPPFLAGS += -tp=haswell -Mvect=simd:256
+-	endif
+-    else
+-	ifeq ($(PERFORMING_CONDA_BUILD),True)
+-	   ifeq ($(PLATFORM),Darwin)
+-		CPPFLAGS += -mpopcnt
+-	   else
+-		# enable avx2
+-		CPPFLAGS += -march=haswell -mtune=znver2
+-	   endif
+-	else
+-		CPPFLAGS += -march=native -mtune=native
+-	endif
+-    endif
+-else
+-    ifneq (,$(findstring pgi,$(COMPILER)))
+-	ifeq ($(PERFORMING_CONDA_BUILD),True)
+-		# PGI does not support anything older than sandybridge
+-		CPPFLAGS += -tp=sandybridge -Mvect=simd:256
+-	endif
+-    else
+-	ifeq ($(PERFORMING_CONDA_BUILD),True)
+-		CPPFLAGS += -mtune=core2
+-	else
+-		CPPFLAGS += -march=native -mtune=native
+-	endif
+-    endif
+-endif
+-
+ ifeq (,$(findstring pgi,$(COMPILER)))
+     ifneq ($(PERFORMING_CONDA_BUILD),True)
+ 	# basically, not gcc



View it on GitLab: https://salsa.debian.org/med-team/unifrac-tools/-/compare/b12b139914a4c53cddd970f75335f59367e9dbbc...bd6f8760b53886c282eb4f0245d9196967e6b86c

-- 
View it on GitLab: https://salsa.debian.org/med-team/unifrac-tools/-/compare/b12b139914a4c53cddd970f75335f59367e9dbbc...bd6f8760b53886c282eb4f0245d9196967e6b86c
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/20230726/088cedc0/attachment-0001.htm>