[scotch] 03/04: don't use -DSCOTCH_PTHREAD_AFFINITY_LINUX on hurd

[Drew Parsons]

This is an automated email from the git hooks/post-receive script.

dparsons pushed a commit to tag debian/6.0.4.dfsg1-6
in repository scotch.

commit c80c86b18a6d6c8dd3503326d720d8386ef77bee
Author: Drew Parsons <dparsons at debian.org>
Date:   Sun Nov 26 22:56:57 2017 +0800

    don't use -DSCOTCH_PTHREAD_AFFINITY_LINUX on hurd
    
    -DSCOTCH_PTHREAD_AFFINITY_LINUX (pthread_setaffinity_np) is not
    supported by hurd
    
    Despite the define's name, kfreebsd does support it (it causes sched.h
    to be included)
---
 debian/changelog | 2 ++
 debian/rules     | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index dde98b2..b220a99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ scotch (6.0.4.dfsg1-6) UNRELEASED; urgency=medium
     running build-time checks.
     - should enable tests to run successfully, so reinstate
       halt-on-error for checks
+  * -DSCOTCH_PTHREAD_AFFINITY_LINUX (pthread_setaffinity_np) is not
+    supported by hurd (kfreebsd does support it)
 
  -- Drew Parsons <dparsons at debian.org>  Sun, 26 Nov 2017 22:37:46 +0800
 
diff --git a/debian/rules b/debian/rules
index f475851..40a5c9e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,14 +26,17 @@ CCP=mpicc
 export CFLAGS_COMMON = -O3 -fPIC -I. -I/usr/include/mpi \
 			-Drestrict=__restrict -DCOMMON_FILE_COMPRESS_GZ \
 			-DCOMMON_PTHREAD \
-			-DSCOTCH_PTHREAD_NUMBER=2 -DSCOTCH_PTHREAD_AFFINITY_LINUX \
+			-DSCOTCH_PTHREAD_NUMBER=2 \
 			-DCOMMON_RANDOM_FIXED_SEED \
 			-DSCOTCH_RENAME -DSCOTCH_RENAME_PARSER
 export LDFLAGS_COMMON = -pthread -lz -lm -lrt
 
 # hurd does not have POSIX time and therefore needs sys/time.h to define struct timeval
+# hurd does not support pthread_setaffinity_np (-DSCOTCH_PTHREAD_AFFINITY_LINUX)
 ifeq ($(DEB_BUILD_ARCH_OS),hurd)
   CFLAGS_COMMON += -DHAVE_SYS_TIME_H
+else
+  CFLAGS_COMMON += -DSCOTCH_PTHREAD_AFFINITY_LINUX
 endif
 
 DEB_DBG_PACKAGE_scotch = scotch-dbg

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/scotch.git