From nobody Wed Nov 03 18:06:34 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E0A73182E159; Wed, 3 Nov 2021 18:06:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hkvpy5WLbz4RwD; Wed, 3 Nov 2021 18:06:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 923781D592; Wed, 3 Nov 2021 18:06:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1A3I6Yn7044667; Wed, 3 Nov 2021 18:06:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A3I6Yct044666; Wed, 3 Nov 2021 18:06:34 GMT (envelope-from git) Date: Wed, 3 Nov 2021 18:06:34 GMT Message-Id: <202111031806.1A3I6Yct044666@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 43cc9e6350f0 - main - misc/urbit: drop unused Meson keyword List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 43cc9e6350f0df54ffda5f462bb6553369f6e496 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=43cc9e6350f0df54ffda5f462bb6553369f6e496 commit 43cc9e6350f0df54ffda5f462bb6553369f6e496 Author: Jan Beich AuthorDate: 2021-11-03 17:55:57 +0000 Commit: Jan Beich 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',