Bug 1048064 - Fix libstagefright build on GNU/kFreeBSD. r=ajones, a=NPOTB
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 05 Aug 2014 16:07:28 +0900
changeset 216329 54b669b7a9c78b0d41262dc0f7ffa3e12802f657
parent 216328 924e2d5187e3b67a61da5ca161b2ae14ab9a6e1c
child 216330 ffcc0f0992dd96cbfe8988c5f66debb49cdfbe4b
push id3857
push userraliiev@mozilla.com
push dateTue, 02 Sep 2014 16:39:23 +0000
treeherdermozilla-beta@5638b907b505 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersajones, NPOTB
bugs1048064
milestone33.0a2
Bug 1048064 - Fix libstagefright build on GNU/kFreeBSD. r=ajones, a=NPOTB
media/libstagefright/moz.build
--- a/media/libstagefright/moz.build
+++ b/media/libstagefright/moz.build
@@ -18,24 +18,26 @@ if CONFIG['OS_TARGET'] == 'WINNT':
         DEFINES['strncasecmp'] = 'strnicmp'
     DEFINES['HAVE_MS_C_RUNTIME'] = True
     DEFINES['__PRETTY_FUNCTION__'] = '__FUNCTION__'
     LOCAL_INCLUDES += [ 'ports/win32/include' ]
 elif CONFIG['OS_TARGET'] == 'Darwin':
     DEFINES['HAVE_SYS_UIO_H'] = True
     DEFINES['off64_t'] = 'off_t'
     LOCAL_INCLUDES += [ 'ports/darwin/include' ]
-elif CONFIG['OS_TARGET'] in ('DragonFly', 'FreeBSD', 'OpenBSD', 'NetBSD'):
-    if not CONFIG['OS_TARGET'] == 'NetBSD':
+elif CONFIG['OS_TARGET'] in ('DragonFly', 'FreeBSD', 'OpenBSD', 'NetBSD',
+        'GNU/kFreeBSD'):
+    if CONFIG['OS_TARGET'] != 'NetBSD':
         DEFINES['ENODATA'] = '-0x80000003'
     if CONFIG['OS_TARGET'] == 'OpenBSD':
         DEFINES['EBADMSG'] = '-0x80000006'
     DEFINES['HAVE_SYS_UIO_H'] = True
-    DEFINES['off64_t'] = 'off_t'
-    LOCAL_INCLUDES += [ 'ports/bsd/include' ]
+    if CONFIG['OS_TARGET'] != 'GNU/kFreeBSD':
+        DEFINES['off64_t'] = 'off_t'
+        LOCAL_INCLUDES += [ 'ports/bsd/include' ]
 else:
     DEFINES['HAVE_SYS_UIO_H'] = True
 
 if CONFIG['OS_TARGET'] != 'Android':
     DEFINES['FAKE_LOG_DEVICE'] = True
     SOURCES += [
         'system/core/liblog/fake_log_device.c',
     ]