[pkg-boost-devel] Bug#630652: bjam: define the right OS name on Hurd

[Pino Toscano]

Package: boost1.46
Version: 1.46.1-6
Severity: normal
Tags: patch
User: debian-hurd at lists.debian.org
Usertags: hurd

Hi,

currently bjam does not identify Hurd when using e.g. os.name in jam scripts:
  $ bjam -v | head -n1
  Boost.Jam  Version 3.1.19. OS=UNKNOWN.

The attached patch (which should be suitable for upstream inclusion) sets the
correct #define's for Hurd in bjam, adding also the path detection for the
bjam test suite.
  $ bjam -v | head -n1
  Boost.Jam  Version 3.1.19. OS=HURD.

Thanks,
-- 
Pino
-------------- next part --------------
Description: bjam: define the right OS variable on Hurd
Author: Pino Toscano <toscano.pino at tiscali.it>

--- a/tools/build/v2/engine/src/jam.h
+++ b/tools/build/v2/engine/src/jam.h
@@ -391,6 +391,10 @@
     #define OSMINOR "OS=KFREEBSD"
     #define OS_KFREEBSD
 #endif
+#ifdef __GNU__
+    #define OSMINOR "OS=HURD"
+    #define OS_HURD
+#endif
 #ifndef OSMINOR
     #define OSMINOR "OS=UNKNOWN"
 #endif
--- a/tools/build/v2/test/BoostBuild.py
+++ b/tools/build/v2/test/BoostBuild.py
@@ -240,6 +240,12 @@
                     jam_build_dir = "bin.freebsd"
                 elif os.uname()[0] == "OSF1":
                     jam_build_dir = "bin.osf"
+                elif os.uname()[0] == "GNU":
+                    cpu = os.uname()[4]
+                    if re.match("i.86.*", cpu):
+                        jam_build_dir = "bin.hurdx86";
+                    else:
+                        jam_build_dir = "bin.hurd" + os.uname()[4]
                 else:
                     raise "Don't know directory where Jam is built for this system: " + os.name + "/" + os.uname()[0]
             else: