The following commit has been merged in the jessie branch: commit 18cd3e50870cf266b994f938f23fa4eaf8cfe5ae Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Sat Oct 5 19:58:53 2013 +0200
Add patch to fix FTBFS on kfreebsd-*, use pthread_self instead of gettid. Thanks Steven Chamberlain for the patch. (closes: #725383) diff --git a/debian/changelog b/debian/changelog index 2b800b2..44e18f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ osgearth (2.4.0+dfsg-6) unstable; urgency=low * Fix watch file, don't strip .0 from debian version. * Batchpatch the symbols files with recent build logs. + * Add patch to fix FTBFS on kfreebsd-*, use pthread_self instead of gettid. + Thanks Steven Chamberlain for the patch. + (closes: #725383) -- Bas Couwenberg <sebas...@xs4all.nl> Tue, 24 Sep 2013 16:59:37 +0200 diff --git a/debian/patches/kfreebsd-getCurrentThreadId.patch b/debian/patches/kfreebsd-getCurrentThreadId.patch new file mode 100644 index 0000000..00e559c --- /dev/null +++ b/debian/patches/kfreebsd-getCurrentThreadId.patch @@ -0,0 +1,29 @@ +Index: osgearth-2.4.0+dfsg/src/osgEarth/ThreadingUtils.cpp +=================================================================== +--- osgearth-2.4.0+dfsg.orig/src/osgEarth/ThreadingUtils.cpp 2013-04-11 19:07:39.000000000 +0100 ++++ osgearth-2.4.0+dfsg/src/osgEarth/ThreadingUtils.cpp 2013-10-04 22:04:38.898332000 +0100 +@@ -20,9 +20,11 @@ + + #ifdef _WIN32 + extern "C" unsigned long __stdcall GetCurrentThreadId(); +-#else ++#elif defined(__APPLE__) || defined(__LINUX__) + # include <unistd.h> + # include <sys/syscall.h> ++#else ++# include <pthread.h> + #endif + + using namespace osgEarth::Threading; +@@ -38,7 +40,10 @@ + return (unsigned)::GetCurrentThreadId(); + #elif __APPLE__ + return ::syscall(SYS_thread_selfid); +-#else ++#elif __LINUX__ + return (unsigned)::syscall(SYS_gettid); ++#else ++ /* :XXX: this truncates to 32 bits, but better than nothing */ ++ return (unsigned)pthread_self(); + #endif + } diff --git a/debian/patches/series b/debian/patches/series index 9391bea..5fb7e42 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ soversion.patch MPGeometry-OpenSceneGraph-3.1.8.patch becuase-typo.patch +kfreebsd-getCurrentThreadId.patch -- osgEarth terrain rendering toolkit _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel