summaryrefslogtreecommitdiff
path: root/misc/urbit/files/patch-meson.build
diff options
context:
space:
mode:
Diffstat (limited to 'misc/urbit/files/patch-meson.build')
-rw-r--r--misc/urbit/files/patch-meson.build37
1 files changed, 0 insertions, 37 deletions
diff --git a/misc/urbit/files/patch-meson.build b/misc/urbit/files/patch-meson.build
deleted file mode 100644
index 7b9603bd2f47..000000000000
--- a/misc/urbit/files/patch-meson.build
+++ /dev/null
@@ -1,37 +0,0 @@
---- meson.build.orig 2018-06-09 02:31:51 UTC
-+++ meson.build
-@@ -225,7 +225,7 @@ conf_data = configuration_data()
- conf_data.set('URBIT_VERSION', '"0.6.0"')
-
- osdet = build_machine.system()
--os_c_flags = ['-funsigned-char','-ffast-math']
-+os_c_flags = ['-funsigned-char','-ffast-math','-fcommon']
- os_deps = []
- os_link_flags = []
-
-@@ -254,12 +254,12 @@ elif osdet == 'darwin'
-
- os_deps = os_deps + [ncurses_dep]
-
--elif osdet == 'bsd'
-+elif osdet == 'freebsd'
- conf_data.set('U3_OS_bsd', true)
-
- pthread_dep = meson.get_compiler('c').find_library('pthread')
- kvm_dep = meson.get_compiler('c').find_library('kvm')
-- ncurses_dep = dependency('ncurses')
-+ ncurses_dep = meson.get_compiler('c').find_library('ncurses')
- os_deps = os_deps + [kvm_dep, pthread_dep, ncurses_dep]
- else
- error('Unsupported OS detected:' + osdet)
-@@ -284,6 +284,10 @@ if osdet == 'darwin'
- libcrypto = meson.get_compiler('c').find_library('crypto', dirs: [ '/usr/local/opt/openssl/lib/' ])
- libssl = meson.get_compiler('c').find_library('ssl', dirs: [ '/usr/local/opt/openssl/lib/' ])
- openssl_dep = declare_dependency(dependencies: [libcrypto, libssl], include_directories: include_directories('/usr/local/opt/openssl/include'))
-+elif osdet == 'freebsd'
-+ libcrypto = meson.get_compiler('c').find_library('crypto', dirs: [ '/usr/lib/' ])
-+ libssl = meson.get_compiler('c').find_library('ssl', dirs: [ '/usr/lib/' ])
-+ openssl_dep = declare_dependency(dependencies: [libcrypto, libssl], include_directories: include_directories('/usr/include'))
- else
- openssl_dep = dependency('openssl', version: '>=1.0.0')
- endif