jack: Work around "error: ::vfscanf has not been declared" on NetBSD 9.x
This commit is contained in:
parent
b4588bf003
commit
781bdd11e6
5 changed files with 26 additions and 14 deletions
|
@ -1,4 +1,4 @@
|
|||
$NetBSD: distinfo,v 1.26 2021/09/10 11:14:05 nia Exp $
|
||||
$NetBSD: distinfo,v 1.27 2021/09/12 06:04:44 nia Exp $
|
||||
|
||||
SHA1 (jack2-1.9.19.tar.gz) = 3182304c0a3ecd911775fb46088f0df79ee9015f
|
||||
RMD160 (jack2-1.9.19.tar.gz) = da6ed4db02dfc856c477d76a73fe22157b6f7df8
|
||||
|
@ -11,9 +11,9 @@ SHA1 (patch-example-clients_wscript) = 9db0899e797acbc416bfd9e6aba50c70bd5ff0ab
|
|||
SHA1 (patch-netbsd_JackAtomic__os.h) = cd9cc4bf9913b3dedfbb8a2ea34077277e17f85d
|
||||
SHA1 (patch-netbsd_JackNetBSDTime.c) = 7cc2504bbd452b703dd062ac5d35f68ffe7e3b0a
|
||||
SHA1 (patch-netbsd_JackPlatformPlug__os.h) = f17b0daf4d8a4ef1001b35e6ea1411cfb1b981c2
|
||||
SHA1 (patch-netbsd_sun_JackSunAdapter.cpp) = e3d2972dd07919c5de266ae830f043aed2662a2c
|
||||
SHA1 (patch-netbsd_sun_JackSunAdapter.cpp) = a3680d9dc6bb78c812590f62b1c24a9c78d65b20
|
||||
SHA1 (patch-netbsd_sun_JackSunAdapter.h) = 740b36c69d02742eceeb724ba18796664fb1bc2d
|
||||
SHA1 (patch-netbsd_sun_JackSunDriver.cpp) = b3f18de879f2d770547ac534bfd4f5bb64db3017
|
||||
SHA1 (patch-netbsd_sun_JackSunDriver.cpp) = 7ffa6b659b1df8eee4cfaa3da8d170b0c3f49355
|
||||
SHA1 (patch-netbsd_sun_JackSunDriver.h) = 9da5fbec2216081876174057f831da4c54e3029e
|
||||
SHA1 (patch-posix_JackNetUnixSocket.cpp) = 562242daf7c0f296bfcd03f468518aaf18d995d9
|
||||
SHA1 (patch-posix_JackNetUnixSocket.h) = ce9a9255dc0dd423562b94b0fcc1012c8ba3a37e
|
||||
|
@ -21,4 +21,4 @@ SHA1 (patch-posix_JackPosixSemaphore.cpp) = 59425ada11a5cab83159691ae10a23c0d367
|
|||
SHA1 (patch-posix_JackSocket.cpp) = 88ae18c3d2cc31a43355ff9b0c78ab13b83bd314
|
||||
SHA1 (patch-tests_wscript) = e0bf616175a116df489808cda8cb8c70890d4da0
|
||||
SHA1 (patch-tools_wscript) = 197fc67305c62ccfb35b06d194d1785bb8ef5ab3
|
||||
SHA1 (patch-wscript) = 71c9a1c583b864b6d89c081aa0e259ff898e293d
|
||||
SHA1 (patch-wscript) = 2d95ee17426992d921c8b2c432abdf39ec2d54c7
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
$NetBSD: patch-common_wscript,v 1.3 2021/09/10 11:14:05 nia Exp $
|
||||
$NetBSD: patch-common_wscript,v 1.4 2021/09/12 06:04:44 nia Exp $
|
||||
|
||||
Add NetBSD support.
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-netbsd_sun_JackSunAdapter.cpp,v 1.3 2021/09/10 11:14:05 nia Exp $
|
||||
$NetBSD: patch-netbsd_sun_JackSunAdapter.cpp,v 1.4 2021/09/12 06:04:44 nia Exp $
|
||||
|
||||
Add NetBSD support.
|
||||
|
||||
--- netbsd/sun/JackSunAdapter.cpp.orig 2021-09-10 11:08:26.064717543 +0000
|
||||
--- netbsd/sun/JackSunAdapter.cpp.orig 2021-09-12 05:59:47.131738128 +0000
|
||||
+++ netbsd/sun/JackSunAdapter.cpp
|
||||
@@ -0,0 +1,490 @@
|
||||
+/*
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-netbsd_sun_JackSunDriver.cpp,v 1.3 2021/09/10 11:14:05 nia Exp $
|
||||
$NetBSD: patch-netbsd_sun_JackSunDriver.cpp,v 1.4 2021/09/12 06:04:44 nia Exp $
|
||||
|
||||
Add NetBSD support.
|
||||
|
||||
--- netbsd/sun/JackSunDriver.cpp.orig 2021-09-10 11:08:26.142826553 +0000
|
||||
--- netbsd/sun/JackSunDriver.cpp.orig 2021-09-12 05:59:47.195547055 +0000
|
||||
+++ netbsd/sun/JackSunDriver.cpp
|
||||
@@ -0,0 +1,569 @@
|
||||
+/*
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
$NetBSD: patch-wscript,v 1.2 2021/09/10 11:14:05 nia Exp $
|
||||
$NetBSD: patch-wscript,v 1.3 2021/09/12 06:04:44 nia Exp $
|
||||
|
||||
- Add NetBSD support.
|
||||
- Ensure man pages are installed on all Unixes.
|
||||
|
@ -13,7 +13,19 @@ $NetBSD: patch-wscript,v 1.2 2021/09/10 11:14:05 nia Exp $
|
|||
('IS_SUN', 'SunOS', ['sunos']),
|
||||
('IS_WINDOWS', 'Windows', ['cygwin', 'msys', 'win32'])
|
||||
]
|
||||
@@ -531,6 +532,9 @@ def obj_add_includes(bld, obj):
|
||||
@@ -231,6 +232,11 @@ def configure(conf):
|
||||
conf.env.append_unique('CXXFLAGS', ['-Wall', '-Wno-invalid-offsetof'])
|
||||
conf.env.append_unique('CXXFLAGS', '-std=gnu++11')
|
||||
|
||||
+ # Needed to work around "error: ::vfscanf has not been declared" failures
|
||||
+ # prior to NetBSD 9.99.x.
|
||||
+ if conf.env['IS_NETBSD']:
|
||||
+ conf.env.append_unique('CXXFLAGS', '-D_NETBSD_SOURCE')
|
||||
+
|
||||
if not conf.env['IS_MACOSX']:
|
||||
conf.env.append_unique('LDFLAGS', '-Wl,--no-undefined')
|
||||
else:
|
||||
@@ -531,6 +537,9 @@ def obj_add_includes(bld, obj):
|
||||
if bld.env['IS_SUN']:
|
||||
obj.includes += ['posix', 'solaris']
|
||||
|
||||
|
@ -23,7 +35,7 @@ $NetBSD: patch-wscript,v 1.2 2021/09/10 11:14:05 nia Exp $
|
|||
if bld.env['IS_WINDOWS']:
|
||||
obj.includes += ['windows']
|
||||
|
||||
@@ -678,6 +682,11 @@ def build_drivers(bld):
|
||||
@@ -678,6 +687,11 @@ def build_drivers(bld):
|
||||
'windows/portaudio/JackPortAudioDriver.cpp',
|
||||
]
|
||||
|
||||
|
@ -35,7 +47,7 @@ $NetBSD: patch-wscript,v 1.2 2021/09/10 11:14:05 nia Exp $
|
|||
winmme_src = [
|
||||
'windows/winmme/JackWinMMEDriver.cpp',
|
||||
'windows/winmme/JackWinMMEInputPort.cpp',
|
||||
@@ -779,6 +788,12 @@ def build_drivers(bld):
|
||||
@@ -779,6 +793,12 @@ def build_drivers(bld):
|
||||
target = 'oss',
|
||||
source = oss_src)
|
||||
|
||||
|
@ -48,7 +60,7 @@ $NetBSD: patch-wscript,v 1.2 2021/09/10 11:14:05 nia Exp $
|
|||
def build(bld):
|
||||
if not bld.variant and bld.env['BUILD_WITH_32_64']:
|
||||
Options.commands.append(bld.cmd + '_' + lib32)
|
||||
@@ -821,9 +836,10 @@ def build(bld):
|
||||
@@ -821,9 +841,10 @@ def build(bld):
|
||||
bld.recurse('tools')
|
||||
|
||||
if bld.env['IS_LINUX']:
|
||||
|
|
Loading…
Reference in a new issue