From 665c0078ef9fbbca9a60dac0636a9568aa3013cf Mon Sep 17 00:00:00 2001 From: "Aaron M. Ucko" Date: Sat, 11 Jun 2011 00:31:52 +0000 Subject: [PATCH] debian/patches/hurd_fixes: new; fix hurd-specific issues. (Closes: #629656, this time for sure. ;-) --- debian/changelog | 4 +++- debian/patches/hurd_fixes | 48 +++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 debian/patches/hurd_fixes diff --git a/debian/changelog b/debian/changelog index e7f70eb6..2b910e1c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,10 @@ ncbi-blast+ (2.2.25-4) UNRELEASED; urgency=low * NOT YET RELEASED. * Team upload. * debian/patches/support_other_cpus: belatedly add a descriptive header. + * debian/patches/hurd_fixes: new; fix hurd-specific issues. + (Closes: #629656, this time for sure. ;-) - -- Aaron M. Ucko Fri, 10 Jun 2011 20:30:19 -0400 + -- Aaron M. Ucko Fri, 10 Jun 2011 20:31:47 -0400 ncbi-blast+ (2.2.25-3) unstable; urgency=low diff --git a/debian/patches/hurd_fixes b/debian/patches/hurd_fixes new file mode 100644 index 00000000..8341486d --- /dev/null +++ b/debian/patches/hurd_fixes @@ -0,0 +1,48 @@ +Subject: fix portability issues that led to Hurd build failures + +* src/build-system/configure(.ac): when checking how select works, reset + the alarm from the signal handler to avoid spinning forever. +* src/connect/ncbi_socket_cxx.cpp: cope with missing PATH_MAX everywhere, + not just under Windows. + +Author: Aaron M. Ucko +Last-Update: 2011-06-10 +Index: b/c++/src/build-system/configure +=================================================================== +--- a/c++/src/build-system/configure 2011-06-10 20:18:43.000000000 -0400 ++++ b/c++/src/build-system/configure 2011-06-10 20:19:52.000000000 -0400 +@@ -11416,7 +11416,7 @@ + #ifdef HAVE_UNISTD_H + # include + #endif +- RETSIGTYPE handler(int sig) { } ++ RETSIGTYPE handler(int sig) { alarm(0); } + int + main () + { +Index: b/c++/src/build-system/configure.ac +=================================================================== +--- a/c++/src/build-system/configure.ac 2011-06-10 20:18:43.000000000 -0400 ++++ b/c++/src/build-system/configure.ac 2011-06-10 20:19:39.000000000 -0400 +@@ -2811,7 +2811,7 @@ + #ifdef HAVE_UNISTD_H + # include + #endif +- RETSIGTYPE handler(int sig) { }]], ++ RETSIGTYPE handler(int sig) { alarm(0); }]], + [[struct timeval timeout = { 5, 0 }; + signal(SIGALRM, &handler); + alarm(1); +Index: b/c++/src/connect/ncbi_socket_cxx.cpp +=================================================================== +--- a/c++/src/connect/ncbi_socket_cxx.cpp 2011-06-10 20:19:06.000000000 -0400 ++++ b/c++/src/connect/ncbi_socket_cxx.cpp 2011-06-10 20:20:12.000000000 -0400 +@@ -34,7 +34,7 @@ + #include + #include + #include // for PATH_MAX +-#if defined(NCBI_OS_MSWIN) && !defined(PATH_MAX) ++#ifndef PATH_MAX + # define PATH_MAX 512 // will actually use less than 32 chars + #endif + diff --git a/debian/patches/series b/debian/patches/series index d6446b15..eb1f6ac9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ +hurd_fixes legacy_rename_rpsblast fix_checks fix_gcc46_errors -- 2.30.2