[med-svn] [Git][med-team/plink2][master] 5 commits: freshen patches

[Michael R. Crusoe]

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


Commits:
48aaa17e by Michael R. Crusoe at 2020-06-01T20:21:58+02:00
freshen patches

- - - - -
f587100b by Michael R. Crusoe at 2020-06-01T20:22:04+02:00
ppc64el test

- - - - -
fdf979f3 by Michael R. Crusoe at 2020-06-01T20:59:20+02:00
bump simde dep

- - - - -
93205c86 by Michael R. Crusoe at 2020-06-19T14:30:27+02:00
Fix simde patch for non-x86

- - - - -
2afa2e5b by Michael R. Crusoe at 2020-06-20T18:09:05+02:00
forward some patches

- - - - -


6 changed files:

- debian/changelog
- debian/control
- debian/patches/Fix_Makefile.patch
- debian/patches/crossbuild
- debian/patches/simde
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+plink2 (2.00~a3-200511+dfsg-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Fix simde patch for non-x86
+
+ -- Michael R. Crusoe <crusoe at debian.org>  Fri, 19 Jun 2020 14:30:10 +0200
+
 plink2 (2.00~a3-200511+dfsg-1) unstable; urgency=medium
 
   * New upstream release.


=====================================
debian/control
=====================================
@@ -9,7 +9,7 @@ Build-Depends: debhelper-compat (= 12),
                liblapack-dev,
                libzstd-dev (>= 1.4.4),
                zlib1g-dev,
-               libsimde-dev,
+               libsimde-dev (>= 0.0.0.git.20200531),
                libdeflate-dev
 Standards-Version: 4.5.0
 Vcs-Browser: https://salsa.debian.org/med-team/plink2


=====================================
debian/patches/Fix_Makefile.patch
=====================================
@@ -34,7 +34,7 @@ Last-Update: 2019-12-06
  # zstd appears to be seriously targeted at -O3; see 26 Jul 2016 entry at
  # cbloom.com/rants.html
  ifdef ZSTD_O2
-@@ -144,14 +144,14 @@
+@@ -146,14 +146,14 @@
  all: plink2 pgen_compress
  
  plink2: $(CSRC2) $(ZCSRC2) $(CCSRC2) ../plink2_cpu.cc


=====================================
debian/patches/crossbuild
=====================================
@@ -1,5 +1,6 @@
-From: Michael R. Crusoe <michael.crusoe at gmail.com>
+From: Michael R. Crusoe <crusoe at debian.org>
 Subject: enable cross building
+Forwarded: https://github.com/chrchang/plink-ng/pull/145
 --- plink2.orig/build_dynamic/Makefile
 +++ plink2/build_dynamic/Makefile
 @@ -29,6 +29,8 @@


=====================================
debian/patches/simde
=====================================
@@ -1,5 +1,6 @@
 Author: Michael R. Crusoe <michael.crusoe at gmail.com>
 Description: Enable buidling on non-AMD64
+Forwarded: https://github.com/chrchang/plink-ng/pull/146
 --- plink2.orig/include/plink2_base.h
 +++ plink2/include/plink2_base.h
 @@ -134,14 +134,8 @@
@@ -55,7 +56,7 @@ Description: Enable buidling on non-AMD64
  #endif
 --- plink2.orig/build_dynamic/Makefile
 +++ plink2/build_dynamic/Makefile
-@@ -141,17 +141,19 @@
+@@ -143,17 +143,19 @@
    CXXFLAGS += -Wno-sign-compare
  endif
  
@@ -80,3 +81,15 @@ Description: Enable buidling on non-AMD64
  
  .PHONY: clean
  clean:
+--- plink2.orig/plink2_glm.cc
++++ plink2/plink2_glm.cc
+@@ -19,6 +19,9 @@
+ #include "plink2_glm.h"
+ #include "plink2_matrix.h"
+ 
++#define SIMDE_ENABLE_NATIVE_ALIASES
++#include <simde/x86/sse2.h>
++
+ #ifdef __cplusplus
+ namespace plink2 {
+ #endif


=====================================
debian/rules
=====================================
@@ -1,11 +1,16 @@
 #!/usr/bin/make -f
 
 include /usr/share/dpkg/default.mk
+ifeq (ppc64el,$(DEB_HOST_ARCH))
+	DEB_CFLAGS_MAINT_APPEND+=-mcpu=power8
+	DEB_CXXFLAGS_MAINT_APPEND+=-mcpu=power8
+endif
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_CFLAGS_MAINT_APPEND+=-DSIMDE_ENABLE_OPENMP -fopenmp-simd -O3
 export DEB_CXXFLAGS_MAINT_APPEND+=-DSIMDE_ENABLE_OPENMP -fopenmp-simd -O3
 export DEB_LDFLAGS_MAINT_APPEND+=-ldeflate
 
+
 DIRECTORY=build_dynamic/
 
 prefix=$(CURDIR)/debian/$(DEB_SOURCE)/usr



View it on GitLab: https://salsa.debian.org/med-team/plink2/-/compare/fabbc52b4360366e1dc8c0ccdeae658da0213dea...2afa2e5be8260dba45e0f9909445609f4290915e

-- 
View it on GitLab: https://salsa.debian.org/med-team/plink2/-/compare/fabbc52b4360366e1dc8c0ccdeae658da0213dea...2afa2e5be8260dba45e0f9909445609f4290915e
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/20200620/53279759/attachment-0001.html>