[med-svn] [Git][med-team/vg][master] Force the use of the system package for SIMDe.

[Michael R. Crusoe (@crusoe)]

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


Commits:
021f7e55 by Michael R. Crusoe at 2023-01-22T15:48:58+01:00
Force the use of the system package for SIMDe.

- - - - -


4 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
@@ -29,6 +29,9 @@ vg (1.45.0+ds-1) UNRELEASED; urgency=medium
   [ Pierre Gruet ]
   * Using tags and filenamemangle in d/watch
 
+  [ Michael R. Crusoe ]
+  * Force the use of the system package for SIMDe.
+
  -- Michael R. Crusoe <crusoe at debian.org>  Fri, 02 Dec 2022 11:09:44 +0100
 
 vg (1.30.0+ds-1) unstable; urgency=medium


=====================================
debian/copyright
=====================================
@@ -23,6 +23,10 @@ Files-Excluded: deps/libdeflate
                 obj
                 bin
                 lib
+                deps/dozeu/simde
+                deps/gssw/src/simde
+                deps/ssw/src/simde
+                src/simde
                 #deps/ssw
 
 Files: *


=====================================
debian/patches/simde
=====================================
@@ -93,3 +93,36 @@ Forwarded: https://github.com/vgteam/vg/pull/2867
  
  /// Run a preflight check to make sure that the system is usable for this build of vg.
  /// Aborts with a helpful message if this is not the case.
+--- vg.orig/deps/dozeu/dozeu.h
++++ vg/deps/dozeu/dozeu.h
+@@ -37,7 +37,7 @@
+ #endif
+ 
+ #define SIMDE_ENABLE_NATIVE_ALIASES
+-#include "simde/x86/sse4.1.h"
++#include <simde/x86/sse4.1.h>
+ 
+ // Only turn on extern "C" after including code that can use C++ features.
+ #ifdef __cplusplus
+--- vg.orig/deps/gssw/src/gssw.c
++++ vg/deps/gssw/src/gssw.c
+@@ -30,7 +30,7 @@
+  *  Generalized to operate on graphs by Erik Garrison and renamed gssw.c
+  */
+ #define SIMDE_ENABLE_NATIVE_ALIASES
+-#include "simde/x86/sse2.h"
++#include <simde/x86/sse2.h>
+ #include <stdint.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+--- vg.orig/deps/gssw/src/gssw.h
++++ vg/deps/gssw/src/gssw.h
+@@ -14,7 +14,7 @@
+ #include <string.h>
+ #include <stdbool.h>
+ #define SIMDE_ENABLE_NATIVE_ALIASES
+-#include "simde/x86/sse4.1.h"
++#include <simde/x86/sse4.1.h>
+ 
+ /*!	@typedef	structure of the query profile	*/
+ struct gssw_profile;


=====================================
debian/rules
=====================================
@@ -35,6 +35,7 @@ override_dh_auto_clean:
 
 override_dh_auto_build-arch:
 	mkdir -p $(CURDIR)/debian/help
+	find . -type d -name simde | xargs rm -Rf
 ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386))
 	mkdir -p $(prefix)
 	mkdir -p $(libexecdir)



View it on GitLab: https://salsa.debian.org/med-team/vg/-/commit/021f7e55fca54ad11c0fa1c8ee9760c16ac6bf77

-- 
View it on GitLab: https://salsa.debian.org/med-team/vg/-/commit/021f7e55fca54ad11c0fa1c8ee9760c16ac6bf77
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/20230122/07186f22/attachment-0001.htm>