[med-svn] [Git][med-team/phyx][master] 2 commits: Adjust i686.patch to use host_cpu and be more tolerant on i*86 variants.

[Étienne Mollier (@emollier)]

Étienne Mollier pushed to branch master at Debian Med / phyx


Commits:
861cbeb4 by Étienne Mollier at 2022-04-14T14:52:16+02:00
Adjust i686.patch to use host_cpu and be more tolerant on i*86 variants.

- - - - -
2e2c5c8a by Étienne Mollier at 2022-04-14T14:54:08+02:00
ready to upload to unstable perhaps

- - - - -


2 changed files:

- debian/changelog
- debian/patches/i386.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-phyx (1.3+ds-1) UNRELEASED; urgency=medium
+phyx (1.3+ds-1) unstable; urgency=medium
 
   [ Nilesh Patra ]
   * Team upload.
@@ -15,9 +15,8 @@ phyx (1.3+ds-1) UNRELEASED; urgency=medium
 
   [ Étienne Mollier ]
   * Add i386.patch: removing -ffast-math fixes NaN errors on i387 FPU.
-TODO: still ftbfs on i386 salsa ci: the `uname -m` may differ from i686.
 
- -- Étienne Mollier <emollier at debian.org>  Thu, 14 Apr 2022 14:12:01 +0200
+ -- Étienne Mollier <emollier at debian.org>  Thu, 14 Apr 2022 14:53:02 +0200
 
 phyx (1.01+ds-2) unstable; urgency=medium
 


=====================================
debian/patches/i386.patch
=====================================
@@ -12,7 +12,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  ifneq "$(CXX)" "icc"
 -    OPT_FLAGS += -ffast-math -ftree-vectorize
 +    OPT_FLAGS += -ftree-vectorize
-+    ifeq "$(shell uname -m)" "i686"
++    ifneq ($(filter @host_cpu@,i386 i486 i586 i686),)
 +        OPT_FLAGS += -ffloat-store
 +    else
 +        OPT_FLAGS += -ffast-math



View it on GitLab: https://salsa.debian.org/med-team/phyx/-/compare/d04ee07ef393f6f9c6c12fa2898a2530fe83626c...2e2c5c8aba4e1cf947b11413e2cb608f607b1606

-- 
View it on GitLab: https://salsa.debian.org/med-team/phyx/-/compare/d04ee07ef393f6f9c6c12fa2898a2530fe83626c...2e2c5c8aba4e1cf947b11413e2cb608f607b1606
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/20220414/8073e1e5/attachment-0001.htm>