[med-svn] [Git][med-team/abyss][master] 3 commits: Fix build on hurd due to missing header file

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / abyss


Commits:
48faa4a5 by Andreas Tille at 2019-01-23T14:48:00Z
Fix build on hurd due to missing header file

- - - - -
3589f441 by Andreas Tille at 2019-01-23T14:49:11Z
debhelper 12

- - - - -
40496c6f by Andreas Tille at 2019-01-23T14:58:58Z
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/compat
- debian/control
- + debian/patches/hurd.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+abyss (2.1.5-4) unstable; urgency=medium
+
+  * Fix build on hurd due to missing header file (thanks for the patch
+    to Samuel Thibault <sthibault at debian.org>)
+    Closes: #920240
+  * debhelper 12
+
+ -- Andreas Tille <tille at debian.org>  Wed, 23 Jan 2019 15:49:21 +0100
+
 abyss (2.1.5-3) unstable; urgency=medium
 
   * Re-add armel architecture


=====================================
debian/compat
=====================================
@@ -1 +1 @@
-11
+12


=====================================
debian/control
=====================================
@@ -3,7 +3,7 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
 Uploaders: Andreas Tille <tille at debian.org>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 11~),
+Build-Depends: debhelper (>= 12~),
                python-markdown,
                libboost-graph-dev,
                libopenmpi-dev,


=====================================
debian/patches/hurd.patch
=====================================
@@ -0,0 +1,24 @@
+From: Samuel Thibault <sthibault at debian.org>
+Date: Wed, 23 Jan 2019 09:45:27 +0100
+Bug-Debian: https://bugs.debian.org/920240
+Description: Fix build on hurd due to missing header file
+
+--- a/Common/MemoryUtil.h
++++ b/Common/MemoryUtil.h
+@@ -7,8 +7,14 @@
+ #include <unistd.h> // for sbrk
+ 
+ #if __MACH__
+-# include <mach/mach.h> // for mach_task_self
+-# include <mach/task.h> // for task_info
++# ifdef __APPLE__
++#  include <mach/mach.h> // for mach_task_self
++#  include <mach/task.h> // for task_info
++# else
++extern "C" {
++#  include <mach/mach.h> // for mach_task_self and task_info
++}
++# endif
+ #endif
+ 
+ /** Return the number of bytes used by the data and stack segments.


=====================================
debian/patches/series
=====================================
@@ -4,3 +4,4 @@ abyss-32-bit.patch
 fix_bash_script.patch
 big_endian.patch
 strict_alignment.patch
+hurd.patch



View it on GitLab: https://salsa.debian.org/med-team/abyss/compare/747652b53a0b4da028429e0f7c3acf5513a423ee...40496c6f49145e6650293d19f52425d67f9ce01d

-- 
View it on GitLab: https://salsa.debian.org/med-team/abyss/compare/747652b53a0b4da028429e0f7c3acf5513a423ee...40496c6f49145e6650293d19f52425d67f9ce01d
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/20190123/06cf37ab/attachment-0001.html>