git: 43cc9e6350f0 - main - misc/urbit: drop unused Meson keyword
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 03 Nov 2021 18:06:34 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=43cc9e6350f0df54ffda5f462bb6553369f6e496
commit 43cc9e6350f0df54ffda5f462bb6553369f6e496
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2021-11-03 17:55:57 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2021-11-03 18:03:43 +0000
misc/urbit: drop unused Meson keyword
subprojects/commonmark-legacy/meson.build:30:0: ERROR: Got unknown keyword arguments "version"
subprojects/libscrypt/meson.build:17:0: ERROR: Got unknown keyword arguments "version"
subprojects/ed25519/meson.build:21:0: ERROR: Got unknown keyword arguments "version"
subprojects/murmur3/meson.build:7:0: ERROR: Got unknown keyword arguments "version"
subprojects/softfloat3/meson.build:321:0: ERROR: Got unknown keyword arguments "version"
PR: 259080
Reported by: antoine (via exp-run)
Regressed by: https://github.com/mesonbuild/meson/commit/88a1bed81b7d
---
.../files/patch-subprojects_commonmark-legacy_meson.build | 10 ++++++++++
misc/urbit/files/patch-subprojects_ed25519_meson.build | 10 ++++++++++
misc/urbit/files/patch-subprojects_libscrypt_meson.build | 11 +++++++++++
misc/urbit/files/patch-subprojects_murmur3_meson.build | 11 +++++++++++
misc/urbit/files/patch-subprojects_softfloat3_meson.build | 10 ++++++++++
5 files changed, 52 insertions(+)
diff --git a/misc/urbit/files/patch-subprojects_commonmark-legacy_meson.build b/misc/urbit/files/patch-subprojects_commonmark-legacy_meson.build
new file mode 100644
index 000000000000..aa04b7014e55
--- /dev/null
+++ b/misc/urbit/files/patch-subprojects_commonmark-legacy_meson.build
@@ -0,0 +1,10 @@
+--- subprojects/commonmark-legacy/meson.build.orig 2018-05-29 19:31:53 UTC
++++ subprojects/commonmark-legacy/meson.build
+@@ -30,7 +30,6 @@ endif
+ lib = static_library('cmark',
+ sources: src,
+ include_directories : include_dirs,
+-version: version,
+ c_args : ['-Wall', '-std=c99'])
+
+ cmark_dep = declare_dependency(include_directories : include_dirs,
diff --git a/misc/urbit/files/patch-subprojects_ed25519_meson.build b/misc/urbit/files/patch-subprojects_ed25519_meson.build
new file mode 100644
index 000000000000..f686cf17fd0f
--- /dev/null
+++ b/misc/urbit/files/patch-subprojects_ed25519_meson.build
@@ -0,0 +1,10 @@
+--- subprojects/ed25519/meson.build.orig 2018-05-29 19:32:12 UTC
++++ subprojects/ed25519/meson.build
+@@ -21,7 +21,6 @@ install_headers('src/ed25519.h', subdir:'ed25519')
+ lib = static_library('ed25519',
+ sources: src,
+ include_directories : include_dirs,
+-version: version,
+ c_args : ['-Wall'],
+ install: true)
+
diff --git a/misc/urbit/files/patch-subprojects_libscrypt_meson.build b/misc/urbit/files/patch-subprojects_libscrypt_meson.build
new file mode 100644
index 000000000000..725a4e30e003
--- /dev/null
+++ b/misc/urbit/files/patch-subprojects_libscrypt_meson.build
@@ -0,0 +1,11 @@
+--- subprojects/libscrypt/meson.build.orig 2018-05-29 19:32:29 UTC
++++ subprojects/libscrypt/meson.build
+@@ -14,7 +14,7 @@ sources = ['crypto_scrypt-check.c',
+ ]
+ inc = include_directories('./')
+ install_headers('libscrypt.h','sha256.h',subdir: 'libscrypt')
+-lib = static_library('libscrypt', sources: sources, version: version,
++lib = static_library('libscrypt', sources: sources,
+ include_directories : inc,
+ c_args: ['-Wall', '-ffast-math', '-D_FORTIFY_SOURCE=2', '-fstack-protector'],
+ install: true)
diff --git a/misc/urbit/files/patch-subprojects_murmur3_meson.build b/misc/urbit/files/patch-subprojects_murmur3_meson.build
new file mode 100644
index 000000000000..12183d233097
--- /dev/null
+++ b/misc/urbit/files/patch-subprojects_murmur3_meson.build
@@ -0,0 +1,11 @@
+--- subprojects/murmur3/meson.build.orig 2018-05-29 19:33:50 UTC
++++ subprojects/murmur3/meson.build
+@@ -4,7 +4,7 @@ version = meson.project_version()
+
+ inc = include_directories('./')
+ install_headers('murmur3.h', subdir: 'murmur3')
+-lib = static_library('murmur3', sources: ['murmur3.c'], version: version,
++lib = static_library('murmur3', sources: ['murmur3.c'],
+ include_directories: inc,
+ c_args: ['-Wall', '-ffast-math'],
+ install: true)
diff --git a/misc/urbit/files/patch-subprojects_softfloat3_meson.build b/misc/urbit/files/patch-subprojects_softfloat3_meson.build
new file mode 100644
index 000000000000..e2f962178980
--- /dev/null
+++ b/misc/urbit/files/patch-subprojects_softfloat3_meson.build
@@ -0,0 +1,10 @@
+--- subprojects/softfloat3/meson.build.orig 2018-05-15 20:32:16 UTC
++++ subprojects/softfloat3/meson.build
+@@ -320,7 +320,6 @@ install_headers('source/include/softfloat.h',
+
+ lib = static_library('softfloat3', sources: common_src + src_8080sse,
+ include_directories: incdir,
+- version: version,
+ c_args: ['-Werror-implicit-function-declaration',
+ '-DSOFTFLOAT_FAST_INT64',
+ '-O2',