[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#717364: ninja-build: FTBFS on non-Linux: option --platform: invalid choice



Package: ninja-build
Version: 1.3.4-1.1
Tags: patch
Followup-For: Bug #717364

Hi,

The attached patch seems to fix building on kfreebsd 9 (and later)
very easily.

Thanks.

-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: kfreebsd-amd64 (x86_64)

Kernel: kFreeBSD 9.0-2-amd64-xenhvm
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Index: ninja-build-1.3.4/platform_helper.py
===================================================================
--- ninja-build-1.3.4.orig/platform_helper.py	2013-06-04 19:47:31.000000000 +0100
+++ ninja-build-1.3.4/platform_helper.py	2014-03-30 17:43:32.035385813 +0100
@@ -19,7 +19,7 @@
 
 def platforms():
     return ['linux', 'darwin', 'freebsd', 'openbsd', 'solaris', 'sunos5',
-            'mingw', 'msvc', 'gnukfreebsd8']
+            'mingw', 'msvc', 'gnukfreebsd']
 
 class Platform( object ):
     def __init__( self, platform):
@@ -31,7 +31,7 @@
             self._platform = 'linux'
         elif self._platform.startswith('freebsd'):
             self._platform = 'freebsd'
-        elif self._platform.startswith('gnukfreebsd8'):
+        elif self._platform.startswith('gnukfreebsd'):
             self._platform = 'freebsd'
         elif self._platform.startswith('openbsd'):
             self._platform = 'openbsd'

Reply to: