Date: Mon, 16 Sep 2024 20:20:21 GMT From: Robert Clausecker <fuz@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: ce5ac39d1dba - main - devel/build2: update to 0.17.0 Message-ID: <202409162020.48GKKL7d062451@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=ce5ac39d1dba8fb5d86b479a43611cab9f3e58d9 commit ce5ac39d1dba8fb5d86b479a43611cab9f3e58d9 Author: Robert Clausecker <fuz@FreeBSD.org> AuthorDate: 2024-09-10 23:50:10 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2024-09-16 20:14:19 +0000 devel/build2: update to 0.17.0 Changelog: https://build2.org/release/0.17.0.xhtml --- devel/build2/Makefile | 3 +- devel/build2/distinfo | 6 +- .../files/patch-build2_libbuild2_cc_guess.cxx | 79 -------- devel/build2/pkg-plist | 222 ++------------------- 4 files changed, 19 insertions(+), 291 deletions(-) diff --git a/devel/build2/Makefile b/devel/build2/Makefile index 5644b30aa334..7362c764a0e8 100644 --- a/devel/build2/Makefile +++ b/devel/build2/Makefile @@ -1,5 +1,5 @@ PORTNAME= build2 -DISTVERSION= 0.16.0 +DISTVERSION= 0.17.0 CATEGORIES= devel MASTER_SITES= https://download.build2.org/${DISTVERSION}/ DISTNAME= build2-toolchain-${DISTVERSION} @@ -58,6 +58,5 @@ do-install: -V -j ${MAKE_JOBS_NUMBER} -J ${MAKE_JOBS_NUMBER} @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./build2/build2/b-boot install: '!config.install.scope=project' libbuild2-*/ \ -V -j ${MAKE_JOBS_NUMBER} -J ${MAKE_JOBS_NUMBER} - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpkg-config-0.1.so .include <bsd.port.mk> diff --git a/devel/build2/distinfo b/devel/build2/distinfo index 9da9e0410257..fd3273058bda 100644 --- a/devel/build2/distinfo +++ b/devel/build2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691238582 -SHA256 (build2-toolchain-0.16.0.tar.xz) = 23793f682a17b1d95c80bbd849244735ed59a3e27361529aa4865d2776ff8adc -SIZE (build2-toolchain-0.16.0.tar.xz) = 5545392 +TIMESTAMP = 1725971116 +SHA256 (build2-toolchain-0.17.0.tar.xz) = 3722a89ea86df742539d0f91bb4429fd46bbf668553a350780a63411b648bf5d +SIZE (build2-toolchain-0.17.0.tar.xz) = 6315460 diff --git a/devel/build2/files/patch-build2_libbuild2_cc_guess.cxx b/devel/build2/files/patch-build2_libbuild2_cc_guess.cxx deleted file mode 100644 index 6721fdcbc86d..000000000000 --- a/devel/build2/files/patch-build2_libbuild2_cc_guess.cxx +++ /dev/null @@ -1,79 +0,0 @@ -commit 0e1b73e3b43bca7c1d77ed669b364819ad211da9 -Author: Boris Kolpackov <boris@codesynthesis.com> -Date: 2024-02-02T11:41:33+02:00 - - Handle unseparated `rc` and `git` suffixes in Clang version (GH issue #360) - ---- build2/libbuild2/cc/guess.cxx.orig 2023-06-19 05:26:33 UTC -+++ build2/libbuild2/cc/guess.cxx -@@ -2421,6 +2421,12 @@ namespace build2 - // - // emcc (...) 2.0.8 - // -+ // Pre-releases of the vanilla Clang append `rc` or `git` to the -+ // version, unfortunately without a separator. So we will handle these -+ // ad hoc. For example: -+ // -+ // FreeBSD clang version 18.1.0rc (https://github.com/llvm/llvm-project.git llvmorg-18-init-18361-g22683463740e) -+ // - auto extract_version = [] (const string& s, bool patch, const char* what) - -> compiler_version - { -@@ -2435,8 +2441,28 @@ namespace build2 - // end of the word position (first space). In fact, we can just - // check if it is >= e. - // -- if (s.find_first_not_of ("1234567890.", b, 11) >= e) -+ size_t p (s.find_first_not_of ("1234567890.", b, 11)); -+ if (p >= e) - break; -+ -+ // Handle the unseparated `rc` and `git` suffixes. -+ // -+ if (p != string::npos) -+ { -+ if (p + 2 == e && (e - b) > 2 && -+ s[p] == 'r' && s[p + 1] == 'c') -+ { -+ e -= 2; -+ break; -+ } -+ -+ if (p + 3 == e && (e - b) > 3 && -+ s[p] == 'g' && s[p + 1] == 'i' && s[p + 2] == 't') -+ { -+ e -= 3; -+ break; -+ } -+ } - } - - if (b == e) -@@ -2472,8 +2498,15 @@ namespace build2 - ver.patch = next ("patch", patch); - - if (e != s.size ()) -- ver.build.assign (s, e + 1, string::npos); -+ { -+ // Skip the separator (it could also be unseparated `rc` or `git`). -+ // -+ if (s[e] == ' ' || s[e] == '-') -+ e++; - -+ ver.build.assign (s, e, string::npos); -+ } -+ - return ver; - }; - -@@ -2496,7 +2529,10 @@ namespace build2 - - // Some overrides for testing. - // -+ //string s (xv != nullptr ? *xv : ""); -+ // - //s = "clang version 3.7.0 (tags/RELEASE_370/final)"; -+ //s = "FreeBSD clang version 18.1.0rc (https://github.com/llvm/llvm-project.git llvmorg-18-init-18361-g22683463740e)"; - // - //gr.id.variant = "apple"; - //s = "Apple LLVM version 7.3.0 (clang-703.0.16.1)"; diff --git a/devel/build2/pkg-plist b/devel/build2/pkg-plist index 66c38b78b797..122054fff055 100644 --- a/devel/build2/pkg-plist +++ b/devel/build2/pkg-plist @@ -1,13 +1,6 @@ bin/b bin/bdep bin/bpkg -include/libbpkg/buildfile-scanner.hxx -include/libbpkg/buildfile-scanner.txx -include/libbpkg/export.hxx -include/libbpkg/manifest.hxx -include/libbpkg/manifest.ixx -include/libbpkg/package-name.hxx -include/libbpkg/version.hxx include/libbuild2/action.hxx include/libbuild2/adhoc-rule-buildscript.hxx include/libbuild2/adhoc-rule-cxx.hxx @@ -56,6 +49,7 @@ include/libbuild2/cc/link-rule.hxx include/libbuild2/cc/module.hxx include/libbuild2/cc/parser.hxx include/libbuild2/cc/pkgconfig.hxx +include/libbuild2/cc/predefs-rule.hxx include/libbuild2/cc/target.hxx include/libbuild2/cc/types.hxx include/libbuild2/cc/utility.hxx @@ -110,6 +104,8 @@ include/libbuild2/install/init.hxx include/libbuild2/install/operation.hxx include/libbuild2/install/rule.hxx include/libbuild2/install/utility.hxx +include/libbuild2/json.hxx +include/libbuild2/json.ixx include/libbuild2/kconfig/export.hxx include/libbuild2/kconfig/init.hxx include/libbuild2/lexer.hxx @@ -234,6 +230,10 @@ include/libbutl/path-pattern.ixx include/libbutl/path.hxx include/libbutl/path.ixx include/libbutl/path.txx +include/libbutl/pkg-config/libpkg-config/export.h +include/libbutl/pkg-config/libpkg-config/list.h +include/libbutl/pkg-config/libpkg-config/pkg-config.h +include/libbutl/pkg-config/libpkg-config/version.h include/libbutl/prefix-map.hxx include/libbutl/prefix-map.txx include/libbutl/process-details.hxx @@ -279,190 +279,9 @@ include/libbutl/uuid.hxx include/libbutl/uuid.ixx include/libbutl/vector-view.hxx include/libbutl/version.hxx -include/libpkg-config/export.h -include/libpkg-config/list.h -include/libpkg-config/pkg-config.h -include/libpkg-config/version.h -include/odb/c-array-traits.hxx -include/odb/cache-traits.hxx -include/odb/callback.hxx -include/odb/connection.hxx -include/odb/connection.ixx -include/odb/connection.txx -include/odb/container-traits.hxx -include/odb/core.hxx -include/odb/database.hxx -include/odb/database.ixx -include/odb/database.txx -include/odb/details/buffer.hxx -include/odb/details/build2/config.h -include/odb/details/c-string.hxx -include/odb/details/condition.hxx -include/odb/details/config.h -include/odb/details/config.hxx -include/odb/details/exception.hxx -include/odb/details/export.hxx -include/odb/details/function-wrapper.hxx -include/odb/details/function-wrapper.ixx -include/odb/details/function-wrapper.txx -include/odb/details/lock.hxx -include/odb/details/meta/answer.hxx -include/odb/details/meta/class-p.hxx -include/odb/details/meta/polymorphic-p.hxx -include/odb/details/meta/remove-const-volatile.hxx -include/odb/details/meta/remove-const.hxx -include/odb/details/meta/remove-pointer.hxx -include/odb/details/meta/remove-volatile.hxx -include/odb/details/meta/static-assert.hxx -include/odb/details/mutex.hxx -include/odb/details/shared-ptr-fwd.hxx -include/odb/details/shared-ptr.hxx -include/odb/details/shared-ptr/base.hxx -include/odb/details/shared-ptr/base.ixx -include/odb/details/shared-ptr/base.txx -include/odb/details/shared-ptr/counter-type.hxx -include/odb/details/shared-ptr/exception.hxx -include/odb/details/thread.hxx -include/odb/details/tls.hxx -include/odb/details/transfer-ptr.hxx -include/odb/details/type-info.hxx -include/odb/details/unique-ptr.hxx -include/odb/details/unused.hxx -include/odb/details/wrapper-p.hxx -include/odb/exception.hxx -include/odb/exceptions.hxx -include/odb/forward.hxx -include/odb/function-table.hxx -include/odb/lazy-pointer-traits.hxx -include/odb/lazy-ptr-impl.hxx -include/odb/lazy-ptr-impl.ixx -include/odb/lazy-ptr-impl.txx -include/odb/lazy-ptr.hxx -include/odb/lazy-ptr.ixx -include/odb/lazy-ptr.txx -include/odb/nested-container.hxx -include/odb/no-id-object-result.hxx -include/odb/no-id-object-result.txx -include/odb/no-op-cache-traits.hxx -include/odb/nullable.hxx -include/odb/object-result.hxx -include/odb/pointer-traits.hxx -include/odb/polymorphic-info.hxx -include/odb/polymorphic-map.hxx -include/odb/polymorphic-map.ixx -include/odb/polymorphic-map.txx -include/odb/polymorphic-object-result.hxx -include/odb/polymorphic-object-result.txx -include/odb/post.hxx -include/odb/pre.hxx -include/odb/prepared-query.hxx -include/odb/query-dynamic.hxx -include/odb/query-dynamic.ixx -include/odb/query-dynamic.txx -include/odb/query.hxx -include/odb/result.hxx -include/odb/result.txx -include/odb/schema-catalog-impl.hxx -include/odb/schema-catalog.hxx -include/odb/schema-version.hxx -include/odb/section.hxx -include/odb/session.hxx -include/odb/session.ixx -include/odb/session.txx -include/odb/simple-object-result.hxx -include/odb/simple-object-result.txx -include/odb/sqlite/auto-handle.hxx -include/odb/sqlite/binding.hxx -include/odb/sqlite/blob-stream.hxx -include/odb/sqlite/blob.hxx -include/odb/sqlite/connection-factory.hxx -include/odb/sqlite/connection.hxx -include/odb/sqlite/connection.ixx -include/odb/sqlite/container-statements.hxx -include/odb/sqlite/container-statements.txx -include/odb/sqlite/database.hxx -include/odb/sqlite/database.ixx -include/odb/sqlite/details/build2/config.h -include/odb/sqlite/details/config.h -include/odb/sqlite/details/config.hxx -include/odb/sqlite/details/conversion.hxx -include/odb/sqlite/details/export.hxx -include/odb/sqlite/error.hxx -include/odb/sqlite/exceptions.hxx -include/odb/sqlite/forward.hxx -include/odb/sqlite/no-id-object-result.hxx -include/odb/sqlite/no-id-object-result.txx -include/odb/sqlite/no-id-object-statements.hxx -include/odb/sqlite/no-id-object-statements.txx -include/odb/sqlite/polymorphic-object-result.hxx -include/odb/sqlite/polymorphic-object-result.txx -include/odb/sqlite/polymorphic-object-statements.hxx -include/odb/sqlite/polymorphic-object-statements.txx -include/odb/sqlite/prepared-query.hxx -include/odb/sqlite/query-dynamic.hxx -include/odb/sqlite/query-dynamic.ixx -include/odb/sqlite/query-dynamic.txx -include/odb/sqlite/query.hxx -include/odb/sqlite/query.ixx -include/odb/sqlite/query.txx -include/odb/sqlite/section-statements.hxx -include/odb/sqlite/section-statements.txx -include/odb/sqlite/simple-object-result.hxx -include/odb/sqlite/simple-object-result.txx -include/odb/sqlite/simple-object-statements.hxx -include/odb/sqlite/simple-object-statements.ixx -include/odb/sqlite/simple-object-statements.txx -include/odb/sqlite/sqlite-types.hxx -include/odb/sqlite/statement-cache.hxx -include/odb/sqlite/statement-cache.txx -include/odb/sqlite/statement.hxx -include/odb/sqlite/statements-base.hxx -include/odb/sqlite/stream.hxx -include/odb/sqlite/text-stream.hxx -include/odb/sqlite/text.hxx -include/odb/sqlite/tracer.hxx -include/odb/sqlite/traits-calls.hxx -include/odb/sqlite/traits.hxx -include/odb/sqlite/transaction-impl.hxx -include/odb/sqlite/transaction.hxx -include/odb/sqlite/transaction.ixx -include/odb/sqlite/version-build2.hxx -include/odb/sqlite/version.hxx -include/odb/sqlite/view-result.hxx -include/odb/sqlite/view-result.txx -include/odb/sqlite/view-statements.hxx -include/odb/sqlite/view-statements.txx -include/odb/statement-processing-common.hxx -include/odb/statement.hxx -include/odb/std-array-traits.hxx -include/odb/std-deque-traits.hxx -include/odb/std-forward-list-traits.hxx -include/odb/std-list-traits.hxx -include/odb/std-map-traits.hxx -include/odb/std-set-traits.hxx -include/odb/std-unordered-map-traits.hxx -include/odb/std-unordered-set-traits.hxx -include/odb/std-vector-traits.hxx -include/odb/tracer.hxx -include/odb/traits.hxx -include/odb/transaction.hxx -include/odb/transaction.ixx -include/odb/vector-impl.hxx -include/odb/vector-impl.ixx -include/odb/vector-traits.hxx -include/odb/vector-traits.txx -include/odb/vector.hxx -include/odb/vector.ixx -include/odb/version-build2.hxx -include/odb/version.hxx -include/odb/view-image.hxx -include/odb/view-result.hxx -include/odb/view-result.txx -include/odb/wrapper-traits.hxx lib/libbpkg-%%SOVERSION%%.so -lib/libbpkg.so lib/libbuild2-%%SOVERSION%%.so -lib/libbuild2-autoconf-%%SOVERSION%%-0.2.so +lib/libbuild2-autoconf-%%SOVERSION%%-0.3.so lib/libbuild2-autoconf-%%SOVERSION%%.so lib/libbuild2-autoconf.so lib/libbuild2-bash-%%SOVERSION%%-%%SOVERSION%%.so @@ -494,15 +313,10 @@ lib/libbuild2-version-%%SOVERSION%%.so lib/libbuild2-version.so lib/libbuild2.so lib/libbutl-%%SOVERSION%%.so +lib/libbutl-odb-%%SOVERSION%%.so +lib/libbutl-pkg-config-%%SOVERSION%%.so +lib/libbutl-pkg-config.so lib/libbutl.so -lib/libodb-2.5.0-b.25.so -lib/libodb-sqlite-2.5.0-b.25.so -lib/libodb-sqlite.so -lib/libodb.so -lib/libpkg-config-0.1.so -lib/libpkg-config.so -libdata/pkgconfig/libbpkg.pc -libdata/pkgconfig/libbpkg.shared.pc libdata/pkgconfig/libbuild2-autoconf.pc libdata/pkgconfig/libbuild2-autoconf.shared.pc libdata/pkgconfig/libbuild2-bash.pc @@ -525,14 +339,12 @@ libdata/pkgconfig/libbuild2-version.pc libdata/pkgconfig/libbuild2-version.shared.pc libdata/pkgconfig/libbuild2.pc libdata/pkgconfig/libbuild2.shared.pc +libdata/pkgconfig/libbutl-pkg-config.pc +libdata/pkgconfig/libbutl-pkg-config.shared.pc libdata/pkgconfig/libbutl.pc libdata/pkgconfig/libbutl.shared.pc -libdata/pkgconfig/libodb-sqlite.pc -libdata/pkgconfig/libodb-sqlite.shared.pc -libdata/pkgconfig/libodb.pc -libdata/pkgconfig/libodb.shared.pc -libdata/pkgconfig/libpkg-config.pc -libdata/pkgconfig/libpkg-config.shared.pc +%%DATADIR%%/libbuild2/cc/std.compat.cppm +%%DATADIR%%/libbuild2/cc/std.cppm share/doc/bdep/AUTHORS share/doc/bdep/LEGAL share/doc/bdep/LICENSE @@ -612,7 +424,6 @@ share/doc/bpkg/manifest %%PORTDOCS%%%%DOCSDIR%%/build2-build-system-manual-letter.ps %%PORTDOCS%%%%DOCSDIR%%/build2-build-system-manual.xhtml %%PORTDOCS%%%%DOCSDIR%%/manifest -share/doc/libbpkg/manifest share/doc/libbuild2-autoconf/AUTHORS share/doc/libbuild2-autoconf/LICENSE share/doc/libbuild2-autoconf/README.md @@ -624,9 +435,6 @@ share/doc/libbuild2-kconfig/README.md share/doc/libbuild2-kconfig/build2-kconfig-manual.xhtml share/doc/libbuild2-kconfig/manifest share/doc/libbutl/manifest -share/doc/libodb-sqlite/manifest -share/doc/libodb/manifest -share/doc/libpkg-config/manifest share/man/man1/b.1.gz share/man/man1/bdep-argument-grouping.1.gz share/man/man1/bdep-ci.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409162020.48GKKL7d062451>