Date: Thu, 26 Jun 2025 13:20:34 +0200 From: Gordon Bergling <gbe@FreeBSD.org> To: Baptiste Daroussin <bapt@FreeBSD.org> Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 0f5c86ddb025 - main - libyaml: import libyaml vendor version 0.2.5 Message-ID: <aF0tAlgzhgj4vMlG@GB-MBA.local> In-Reply-To: <202506260705.55Q7580o023061@gitrepo.freebsd.org> References: <202506260705.55Q7580o023061@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--hzrBVIImQuW1ziHm Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Bapt, I am getting a buildworld error on both amd64 and aarch64. [...] =3D=3D=3D> usr.sbin/rtsold (includes) =3D=3D=3D> usr.bin/what (includes) =3D=3D=3D> lib/libthr/tests (includes) install: /build/storage/freebsd/src/current/amd64.amd64/tmp/usr/include/pri= vate/yaml: No such file or directory [...] It is a NO_CLEAN=3Dyes build. Is there maybe something missing from the vendor import? --Gordon On Thu, Jun 26, 2025 at 07:05:08AM +0000, Baptiste Daroussin wrote: > The branch main has been updated by bapt: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3D0f5c86ddb0257f4b7620f1d8e8= 98289be30b19bf >=20 > commit 0f5c86ddb0257f4b7620f1d8e898289be30b19bf > Merge: 44d6f4b314ad 5f99da5545eb > Author: Baptiste Daroussin <bapt@FreeBSD.org> > AuthorDate: 2025-06-26 06:57:37 +0000 > Commit: Baptiste Daroussin <bapt@FreeBSD.org> > CommitDate: 2025-06-26 07:02:31 +0000 >=20 > libyaml: import libyaml vendor version 0.2.5 > =20 > The yaml parser used in nuageinit is too incomplete, import libyaml > in order to be able to use as a complete parser for nuageinit. >=20 > contrib/libyaml/.appveyor.yml | 29 + > contrib/libyaml/.github/workflows/main.yml | 59 + > contrib/libyaml/.gitignore | 46 + > contrib/libyaml/.indent.pro | 1 + > contrib/libyaml/.makefile | 63 + > contrib/libyaml/.travis.yml | 28 + > contrib/libyaml/CMakeLists.txt | 160 + > contrib/libyaml/Changes | 372 ++ > contrib/libyaml/License | 20 + > contrib/libyaml/Makefile.am | 54 + > contrib/libyaml/ReadMe.md | 46 + > contrib/libyaml/announcement.msg | 89 + > contrib/libyaml/bootstrap | 3 + > contrib/libyaml/configure.ac | 73 + > contrib/libyaml/doc/doxygen.cfg | 222 ++ > contrib/libyaml/docker/README.mkd | 17 + > contrib/libyaml/docker/alpine-3.7 | 26 + > contrib/libyaml/docker/fedora-25 | 26 + > contrib/libyaml/docker/ubuntu-14.04 | 29 + > contrib/libyaml/docker/ubuntu-16.04 | 24 + > contrib/libyaml/examples/anchors.yaml | 10 + > contrib/libyaml/examples/array.yaml | 2 + > contrib/libyaml/examples/global-tag.yaml | 14 + > contrib/libyaml/examples/json.yaml | 1 + > contrib/libyaml/examples/mapping.yaml | 2 + > contrib/libyaml/examples/numbers.yaml | 1 + > contrib/libyaml/examples/strings.yaml | 7 + > contrib/libyaml/examples/tags.yaml | 7 + > contrib/libyaml/examples/yaml-version.yaml | 3 + > contrib/libyaml/include/Makefile.am | 17 + > contrib/libyaml/include/yaml.h | 1985 +++++++++++ > ...terfuzz-testcase-minimized-5607885063061504.yml | 1 + > contrib/libyaml/src/Makefile.am | 4 + > contrib/libyaml/src/api.c | 1393 ++++++++ > contrib/libyaml/src/dumper.c | 394 +++ > contrib/libyaml/src/emitter.c | 2358 +++++++++++++ > contrib/libyaml/src/loader.c | 544 +++ > contrib/libyaml/src/parser.c | 1375 ++++++++ > contrib/libyaml/src/reader.c | 469 +++ > contrib/libyaml/src/scanner.c | 3598 ++++++++++++++= ++++++ > contrib/libyaml/src/writer.c | 141 + > contrib/libyaml/src/yaml_private.h | 684 ++++ > contrib/libyaml/tests/CMakeLists.txt | 27 + > contrib/libyaml/tests/Makefile.am | 9 + > contrib/libyaml/tests/ReadMe.md | 63 + > contrib/libyaml/tests/example-deconstructor-alt.c | 800 +++++ > contrib/libyaml/tests/example-deconstructor.c | 1127 ++++++ > contrib/libyaml/tests/example-reformatter-alt.c | 217 ++ > contrib/libyaml/tests/example-reformatter.c | 202 ++ > contrib/libyaml/tests/run-all-tests.sh | 29 + > contrib/libyaml/tests/run-dumper.c | 314 ++ > contrib/libyaml/tests/run-emitter-test-suite.c | 290 ++ > contrib/libyaml/tests/run-emitter.c | 327 ++ > contrib/libyaml/tests/run-loader.c | 63 + > contrib/libyaml/tests/run-parser-test-suite.c | 189 + > contrib/libyaml/tests/run-parser.c | 63 + > contrib/libyaml/tests/run-scanner.c | 63 + > contrib/libyaml/tests/test-reader.c | 354 ++ > contrib/libyaml/tests/test-version.c | 29 + > contrib/libyaml/yaml-0.1.pc.in | 10 + > contrib/libyaml/yamlConfig.cmake.in | 16 + > lib/Makefile | 1 + > lib/libyaml/Makefile | 29 + > share/mk/src.libnames.mk | 1 + > 64 files changed, 18620 insertions(+) >=20 > diff --cc contrib/libyaml/.appveyor.yml > index 000000000000,36d706aecdf5..36d706aecdf5 > mode 000000,100644..100644 > --- a/contrib/libyaml/.appveyor.yml > +++ b/contrib/libyaml/.appveyor.yml > diff --cc contrib/libyaml/.github/workflows/main.yml > index 000000000000,c2bdef471011..c2bdef471011 > mode 000000,100644..100644 > --- a/contrib/libyaml/.github/workflows/main.yml > +++ b/contrib/libyaml/.github/workflows/main.yml > diff --cc contrib/libyaml/.gitignore > index 000000000000,000000000000..90840c8ac2de > new file mode 100644 > --- /dev/null > +++ b/contrib/libyaml/.gitignore > @@@ -1,0 -1,0 +1,46 @@@ > ++*.BAK > ++*.a > ++*.cmake > ++*.dll > ++*.exe > ++*.la > ++*.lo > ++*.log > ++*.o > ++*.pc > ++*.so > ++*.trs > ++*~ > ++.deps/ > ++.libs/ > ++/Testing/ > ++/libtool > ++CMakeCache.txt > ++CMakeFiles/ > ++GNUmakefile > ++Makefile > ++Makefile.in > ++/aclocal.m4 > ++/autom4te.cache > ++/config > ++config.h* > ++/config.status > ++/configure > ++stamp-h1 > ++!config/config.h.in > ++/packaging/ > ++/tests/run-dumper > ++/tests/run-emitter > ++/tests/run-emitter-test-suite > ++/tests/run-loader > ++/tests/run-parser > ++/tests/run-parser-test-suite > ++/tests/run-scanner > ++/tests/example-deconstructor > ++/tests/example-deconstructor-alt > ++/tests/example-reformatter > ++/tests/example-reformatter-alt > ++/tests/run-test-suite > ++/tests/test-reader > ++/tests/test-version > ++/dist/ > diff --cc contrib/libyaml/.indent.pro > index 000000000000,d647720f74d6..d647720f74d6 > mode 000000,100644..100644 > --- a/contrib/libyaml/.indent.pro > +++ b/contrib/libyaml/.indent.pro > diff --cc contrib/libyaml/.makefile > index 000000000000,9d526a4d3983..9d526a4d3983 > mode 000000,100644..100644 > --- a/contrib/libyaml/.makefile > +++ b/contrib/libyaml/.makefile > diff --cc contrib/libyaml/.travis.yml > index 000000000000,dca3bc73c4c5..dca3bc73c4c5 > mode 000000,100644..100644 > --- a/contrib/libyaml/.travis.yml > +++ b/contrib/libyaml/.travis.yml > diff --cc contrib/libyaml/CMakeLists.txt > index 000000000000,4f811481779a..4f811481779a > mode 000000,100644..100644 > --- a/contrib/libyaml/CMakeLists.txt > +++ b/contrib/libyaml/CMakeLists.txt > diff --cc contrib/libyaml/Changes > index 000000000000,e4b96edcbef7..e4b96edcbef7 > mode 000000,100644..100644 > --- a/contrib/libyaml/Changes > +++ b/contrib/libyaml/Changes > diff --cc contrib/libyaml/License > index 000000000000,3d82c281ee8c..3d82c281ee8c > mode 000000,100644..100644 > --- a/contrib/libyaml/License > +++ b/contrib/libyaml/License > diff --cc contrib/libyaml/Makefile.am > index 000000000000,551c74071f7a..551c74071f7a > mode 000000,100644..100644 > --- a/contrib/libyaml/Makefile.am > +++ b/contrib/libyaml/Makefile.am > diff --cc contrib/libyaml/ReadMe.md > index 000000000000,2dfcc4476dcd..2dfcc4476dcd > mode 000000,100644..100644 > --- a/contrib/libyaml/ReadMe.md > +++ b/contrib/libyaml/ReadMe.md > diff --cc contrib/libyaml/announcement.msg > index 000000000000,080a864b65d5..080a864b65d5 > mode 000000,100644..100644 > --- a/contrib/libyaml/announcement.msg > +++ b/contrib/libyaml/announcement.msg > diff --cc contrib/libyaml/bootstrap > index 000000000000,1745838c5364..1745838c5364 > mode 000000,100755..100755 > --- a/contrib/libyaml/bootstrap > +++ b/contrib/libyaml/bootstrap > diff --cc contrib/libyaml/configure.ac > index 000000000000,92426f04ec43..92426f04ec43 > mode 000000,100644..100644 > --- a/contrib/libyaml/configure.ac > +++ b/contrib/libyaml/configure.ac > diff --cc contrib/libyaml/doc/doxygen.cfg > index 000000000000,a58bb177a4d2..a58bb177a4d2 > mode 000000,100644..100644 > --- a/contrib/libyaml/doc/doxygen.cfg > +++ b/contrib/libyaml/doc/doxygen.cfg > diff --cc contrib/libyaml/docker/README.mkd > index 000000000000,71c13e17cb12..71c13e17cb12 > mode 000000,100644..100644 > --- a/contrib/libyaml/docker/README.mkd > +++ b/contrib/libyaml/docker/README.mkd > diff --cc contrib/libyaml/docker/alpine-3.7 > index 000000000000,ac2d625beda9..ac2d625beda9 > mode 000000,100644..100644 > --- a/contrib/libyaml/docker/alpine-3.7 > +++ b/contrib/libyaml/docker/alpine-3.7 > diff --cc contrib/libyaml/docker/fedora-25 > index 000000000000,36e58ab0186d..36e58ab0186d > mode 000000,100644..100644 > --- a/contrib/libyaml/docker/fedora-25 > +++ b/contrib/libyaml/docker/fedora-25 > diff --cc contrib/libyaml/docker/ubuntu-14.04 > index 000000000000,6a2b1346fca1..6a2b1346fca1 > mode 000000,100644..100644 > --- a/contrib/libyaml/docker/ubuntu-14.04 > +++ b/contrib/libyaml/docker/ubuntu-14.04 > diff --cc contrib/libyaml/docker/ubuntu-16.04 > index 000000000000,87b7afdfc20e..87b7afdfc20e > mode 000000,100644..100644 > --- a/contrib/libyaml/docker/ubuntu-16.04 > +++ b/contrib/libyaml/docker/ubuntu-16.04 > diff --cc contrib/libyaml/examples/anchors.yaml > index 000000000000,875585317000..875585317000 > mode 000000,100644..100644 > --- a/contrib/libyaml/examples/anchors.yaml > +++ b/contrib/libyaml/examples/anchors.yaml > diff --cc contrib/libyaml/examples/array.yaml > index 000000000000,18efd12efbde..18efd12efbde > mode 000000,100644..100644 > --- a/contrib/libyaml/examples/array.yaml > +++ b/contrib/libyaml/examples/array.yaml > diff --cc contrib/libyaml/examples/global-tag.yaml > index 000000000000,1180757d81cb..1180757d81cb > mode 000000,100644..100644 > --- a/contrib/libyaml/examples/global-tag.yaml > +++ b/contrib/libyaml/examples/global-tag.yaml > diff --cc contrib/libyaml/examples/json.yaml > index 000000000000,7822ddc8342f..7822ddc8342f > mode 000000,100644..100644 > --- a/contrib/libyaml/examples/json.yaml > +++ b/contrib/libyaml/examples/json.yaml > diff --cc contrib/libyaml/examples/mapping.yaml > index 000000000000,53d256787c9f..53d256787c9f > mode 000000,100644..100644 > --- a/contrib/libyaml/examples/mapping.yaml > +++ b/contrib/libyaml/examples/mapping.yaml > diff --cc contrib/libyaml/examples/numbers.yaml > index 000000000000,45d2bf01b2ff..45d2bf01b2ff > mode 000000,100644..100644 > --- a/contrib/libyaml/examples/numbers.yaml > +++ b/contrib/libyaml/examples/numbers.yaml > diff --cc contrib/libyaml/examples/strings.yaml > index 000000000000,31b641f4f3cd..31b641f4f3cd > mode 000000,100644..100644 > --- a/contrib/libyaml/examples/strings.yaml > +++ b/contrib/libyaml/examples/strings.yaml > diff --cc contrib/libyaml/examples/tags.yaml > index 000000000000,3d5a010ac0a6..3d5a010ac0a6 > mode 000000,100644..100644 > --- a/contrib/libyaml/examples/tags.yaml > +++ b/contrib/libyaml/examples/tags.yaml > diff --cc contrib/libyaml/examples/yaml-version.yaml > index 000000000000,122b5082b6a7..122b5082b6a7 > mode 000000,100644..100644 > --- a/contrib/libyaml/examples/yaml-version.yaml > +++ b/contrib/libyaml/examples/yaml-version.yaml > diff --cc contrib/libyaml/include/Makefile.am > index 000000000000,3882a2f63dd5..3882a2f63dd5 > mode 000000,100644..100644 > --- a/contrib/libyaml/include/Makefile.am > +++ b/contrib/libyaml/include/Makefile.am > diff --cc contrib/libyaml/include/yaml.h > index 000000000000,89050e4f7dc6..89050e4f7dc6 > mode 000000,100644..100644 > --- a/contrib/libyaml/include/yaml.h > +++ b/contrib/libyaml/include/yaml.h > diff --cc contrib/libyaml/regression-inputs/clusterfuzz-testcase-minimize= d-5607885063061504.yml > index 000000000000,72e9492c1348..72e9492c1348 > mode 000000,100644..100644 > --- a/contrib/libyaml/regression-inputs/clusterfuzz-testcase-minimized-56= 07885063061504.yml > +++ b/contrib/libyaml/regression-inputs/clusterfuzz-testcase-minimized-56= 07885063061504.yml > diff --cc contrib/libyaml/src/Makefile.am > index 000000000000,24cf89d241dd..24cf89d241dd > mode 000000,100644..100644 > --- a/contrib/libyaml/src/Makefile.am > +++ b/contrib/libyaml/src/Makefile.am > diff --cc contrib/libyaml/src/api.c > index 000000000000,16f88bd762aa..16f88bd762aa > mode 000000,100644..100644 > --- a/contrib/libyaml/src/api.c > +++ b/contrib/libyaml/src/api.c > diff --cc contrib/libyaml/src/dumper.c > index 000000000000,1fe940b674da..1fe940b674da > mode 000000,100644..100644 > --- a/contrib/libyaml/src/dumper.c > +++ b/contrib/libyaml/src/dumper.c > diff --cc contrib/libyaml/src/emitter.c > index 000000000000,609b28a4c6e1..609b28a4c6e1 > mode 000000,100644..100644 > --- a/contrib/libyaml/src/emitter.c > +++ b/contrib/libyaml/src/emitter.c > diff --cc contrib/libyaml/src/loader.c > index 000000000000,dea8ac428c2a..dea8ac428c2a > mode 000000,100644..100644 > --- a/contrib/libyaml/src/loader.c > +++ b/contrib/libyaml/src/loader.c > diff --cc contrib/libyaml/src/parser.c > index 000000000000,ec2f8d3e0551..ec2f8d3e0551 > mode 000000,100644..100644 > --- a/contrib/libyaml/src/parser.c > +++ b/contrib/libyaml/src/parser.c > diff --cc contrib/libyaml/src/reader.c > index 000000000000,f3ac54c2517d..f3ac54c2517d > mode 000000,100644..100644 > --- a/contrib/libyaml/src/reader.c > +++ b/contrib/libyaml/src/reader.c > diff --cc contrib/libyaml/src/scanner.c > index 000000000000,c6b498765646..c6b498765646 > mode 000000,100644..100644 > --- a/contrib/libyaml/src/scanner.c > +++ b/contrib/libyaml/src/scanner.c > diff --cc contrib/libyaml/src/writer.c > index 000000000000,5d57f392f1eb..5d57f392f1eb > mode 000000,100644..100644 > --- a/contrib/libyaml/src/writer.c > +++ b/contrib/libyaml/src/writer.c > diff --cc contrib/libyaml/src/yaml_private.h > index 000000000000,b3351c41655c..b3351c41655c > mode 000000,100644..100644 > --- a/contrib/libyaml/src/yaml_private.h > +++ b/contrib/libyaml/src/yaml_private.h > diff --cc contrib/libyaml/tests/CMakeLists.txt > index 000000000000,be2ce399a6bf..be2ce399a6bf > mode 000000,100644..100644 > --- a/contrib/libyaml/tests/CMakeLists.txt > +++ b/contrib/libyaml/tests/CMakeLists.txt > diff --cc contrib/libyaml/tests/Makefile.am > index 000000000000,9597b7fef3ef..9597b7fef3ef > mode 000000,100644..100644 > --- a/contrib/libyaml/tests/Makefile.am > +++ b/contrib/libyaml/tests/Makefile.am > diff --cc contrib/libyaml/tests/ReadMe.md > index 000000000000,bf09447f53f3..bf09447f53f3 > mode 000000,100644..100644 > --- a/contrib/libyaml/tests/ReadMe.md > +++ b/contrib/libyaml/tests/ReadMe.md > diff --cc contrib/libyaml/tests/example-deconstructor-alt.c > index 000000000000,b29c0777b09a..b29c0777b09a > mode 000000,100644..100644 > --- a/contrib/libyaml/tests/example-deconstructor-alt.c > +++ b/contrib/libyaml/tests/example-deconstructor-alt.c > diff --cc contrib/libyaml/tests/example-deconstructor.c > index 000000000000,e048ee6bf0ad..e048ee6bf0ad > mode 000000,100644..100644 > --- a/contrib/libyaml/tests/example-deconstructor.c > +++ b/contrib/libyaml/tests/example-deconstructor.c > diff --cc contrib/libyaml/tests/example-reformatter-alt.c > index 000000000000,e7d006e4a64a..e7d006e4a64a > mode 000000,100644..100644 > --- a/contrib/libyaml/tests/example-reformatter-alt.c > +++ b/contrib/libyaml/tests/example-reformatter-alt.c > diff --cc contrib/libyaml/tests/example-reformatter.c > index 000000000000,08f860c4ef2f..08f860c4ef2f > mode 000000,100644..100644 > --- a/contrib/libyaml/tests/example-reformatter.c > +++ b/contrib/libyaml/tests/example-reformatter.c > diff --cc contrib/libyaml/tests/run-all-tests.sh > index 000000000000,9c92741eca38..9c92741eca38 > mode 000000,100755..100755 > --- a/contrib/libyaml/tests/run-all-tests.sh > +++ b/contrib/libyaml/tests/run-all-tests.sh > diff --cc contrib/libyaml/tests/run-dumper.c > index 000000000000,04c5beeafa57..04c5beeafa57 > mode 000000,100644..100644 > --- a/contrib/libyaml/tests/run-dumper.c > +++ b/contrib/libyaml/tests/run-dumper.c > diff --cc contrib/libyaml/tests/run-emitter-test-suite.c > index 000000000000,ba0f163ad39f..ba0f163ad39f > mode 000000,100644..100644 > --- a/contrib/libyaml/tests/run-emitter-test-suite.c > +++ b/contrib/libyaml/tests/run-emitter-test-suite.c > diff --cc contrib/libyaml/tests/run-emitter.c > index 000000000000,3ffe4754b23e..3ffe4754b23e > mode 000000,100644..100644 > --- a/contrib/libyaml/tests/run-emitter.c > +++ b/contrib/libyaml/tests/run-emitter.c > diff --cc contrib/libyaml/tests/run-loader.c > index 000000000000,8c36b668ce20..8c36b668ce20 > mode 000000,100644..100644 > --- a/contrib/libyaml/tests/run-loader.c > +++ b/contrib/libyaml/tests/run-loader.c > diff --cc contrib/libyaml/tests/run-parser-test-suite.c > index 000000000000,5bdd66238ddd..5bdd66238ddd > mode 000000,100644..100644 > --- a/contrib/libyaml/tests/run-parser-test-suite.c > +++ b/contrib/libyaml/tests/run-parser-test-suite.c > diff --cc contrib/libyaml/tests/run-parser.c > index 000000000000,13031121ae49..13031121ae49 > mode 000000,100644..100644 > --- a/contrib/libyaml/tests/run-parser.c > +++ b/contrib/libyaml/tests/run-parser.c > diff --cc contrib/libyaml/tests/run-scanner.c > index 000000000000,2c79e7ccf380..2c79e7ccf380 > mode 000000,100644..100644 > --- a/contrib/libyaml/tests/run-scanner.c > +++ b/contrib/libyaml/tests/run-scanner.c > diff --cc contrib/libyaml/tests/test-reader.c > index 000000000000,40f8199e009f..40f8199e009f > mode 000000,100644..100644 > --- a/contrib/libyaml/tests/test-reader.c > +++ b/contrib/libyaml/tests/test-reader.c > diff --cc contrib/libyaml/tests/test-version.c > index 000000000000,0c598377f95f..0c598377f95f > mode 000000,100644..100644 > --- a/contrib/libyaml/tests/test-version.c > +++ b/contrib/libyaml/tests/test-version.c > diff --cc contrib/libyaml/yaml-0.1.pc.in > index 000000000000,70c80084dd42..70c80084dd42 > mode 000000,100644..100644 > --- a/contrib/libyaml/yaml-0.1.pc.in > +++ b/contrib/libyaml/yaml-0.1.pc.in > diff --cc contrib/libyaml/yamlConfig.cmake.in > index 000000000000,dd3f8ee25285..dd3f8ee25285 > mode 000000,100644..100644 > --- a/contrib/libyaml/yamlConfig.cmake.in > +++ b/contrib/libyaml/yamlConfig.cmake.in > diff --cc lib/Makefile > index fcb4bd95fecb,000000000000..3417e7b30cb4 > mode 100644,000000..100644 > --- a/lib/Makefile > +++ b/lib/Makefile > @@@ -1,242 -1,0 +1,243 @@@ > +.include <src.opts.mk> > + > +# The SUBDIR_BOOTSTRAP list is a small set of libraries which are used = by many > +# of the other libraries. These are built first with a .WAIT between t= hem > +# and the main list to avoid needing a SUBDIR_DEPEND line on every libr= ary > +# naming just these few items. > + > +SUBDIR_BOOTSTRAP=3D \ > + csu \ > + .WAIT \ > + libc \ > + libc_nonshared \ > + libcompiler_rt \ > + ${_libclang_rt} \ > + libc++ \ > + libc++experimental \ > + libcxxrt \ > + libder \ > + libdiff \ > + libelf \ > + libssp \ > + libssp_nonshared \ > + libsys \ > + msun > + > +# The main list; please keep these sorted alphabetically. > +# The only exception is sqlite3: we place it at the start of the list s= ince it > +# takes a long time to build and starting it first improves parallelism. > + > +SUBDIR=3D ${SUBDIR_BOOTSTRAP} \ > + .WAIT \ > + libsqlite3 \ > + geom \ > + lib9p \ > + libalias \ > + libarchive \ > + libauditd \ > + libbegemot \ > + libblocksruntime \ > + libbsddialog \ > + libbsdstat \ > + libbsm \ > + libbz2 \ > + libcalendar \ > + libcam \ > + libcapsicum \ > + libcasper \ > + libcompat \ > + libcrypt \ > + libdevctl \ > + libdevdctl \ > + libdevinfo \ > + libdevstat \ > + libdl \ > + libdwarf \ > + libedit \ > + libelftc \ > + libevent1 \ > + libexecinfo \ > + libexpat \ > + libfetch \ > + libgcc_eh \ > + libgcc_s \ > + libgeom \ > + libifconfig \ > + libipsec \ > + libiscsiutil \ > + libjail \ > + libkiconv \ > + libkldelf \ > + libkvm \ > + liblua \ > + liblzma \ > + libmemstat \ > + libmd \ > + libmixer \ > + libmt \ > + lib80211 \ > + libnetbsd \ > + libnetmap \ > + libnv \ > + libnvmf \ > + libopenbsd \ > + libpam \ > + libpathconv \ > + libpcap \ > + libpjdlog \ > + libproc \ > + libprocstat \ > + libregex \ > + librpcsvc \ > + librss \ > + librt \ > + librtld_db \ > + libsbuf \ > + libsmb \ > + libstdbuf \ > + libstdthreads \ > + libsysdecode \ > + libtacplus \ > + libthr \ > + libthread_db \ > + libucl \ > + libufs \ > + libugidfw \ > + libulog \ > + libutil \ > + ${_libvgl} \ > + libwrap \ > + libxo \ > + liby \ > ++ libyaml \ > + libz \ > + libzstd \ > + ncurses \ > + nss_tacplus > + > +# Inter-library dependencies. When the makefile for a library contains= LDADD > +# libraries, those libraries should be listed as build order dependenci= es here. > + > +SUBDIR_DEPEND_geom=3D libufs > +SUBDIR_DEPEND_googletest=3D libregex > +SUBDIR_DEPEND_libarchive=3D libz libbz2 libexpat liblzma libmd libzstd > +SUBDIR_DEPEND_libauditdm=3D libbsm > +SUBDIR_DEPEND_libbsddialog=3D ncurses > +SUBDIR_DEPEND_libbsnmp=3D ${_libnetgraph} > +SUBDIR_DEPEND_libc++:=3D libcxxrt > +# libssp_nonshared doesn't need to be linked into libc on every arch, b= ut it is > +# small enough to build that this bit of serialization is likely insign= ificant. > +SUBDIR_DEPEND_libc=3D libsys libcompiler_rt libssp_nonshared > +SUBDIR_DEPEND_libcam=3D libsbuf > +SUBDIR_DEPEND_libcasper=3D libnv > +SUBDIR_DEPEND_libcrypt=3D libmd > +SUBDIR_DEPEND_libdevstat=3D libkvm > +SUBDIR_DEPEND_libdpv=3D libfigpar ncurses libutil > +SUBDIR_DEPEND_libedit=3D ncurses > +SUBDIR_DEPEND_libgeom=3D libexpat libsbuf > +SUBDIR_DEPEND_librpcsec_gss=3D libgssapi > +SUBDIR_DEPEND_libmagic=3D libz > +SUBDIR_DEPEND_libmemstat=3D libkvm > +SUBDIR_DEPEND_libpam=3D libcrypt ${_libradius} librpcsvc libtacplus lib= util ${_libypclnt} ${_libcom_err} > +SUBDIR_DEPEND_libpjdlog=3D libutil > +SUBDIR_DEPEND_libprocstat=3D libkvm libutil > +SUBDIR_DEPEND_libradius=3D libmd > +SUBDIR_DEPEND_libsmb=3D libkiconv > +# See comment above about libssp_nonshared > +SUBDIR_DEPEND_libsys=3D libcompiler_rt libssp_nonshared > +SUBDIR_DEPEND_libtacplus=3D libmd > +SUBDIR_DEPEND_libulog=3D libmd > +SUBDIR_DEPEND_libunbound=3D ${_libldns} > +SUBDIR_DEPEND_liblzma=3D libthr > +.if ${MK_OFED} !=3D "no" > +SUBDIR_DEPEND_libpcap=3D ofed > +.endif > +SUBDIR_DEPEND_nss_tacplus=3D libtacplus > + > +# NB: keep these sorted by MK_* knobs > + > +SUBDIR.${MK_BEARSSL}+=3D libbearssl libsecureboot > +SUBDIR.${MK_BLACKLIST}+=3Dlibblacklist > +SUBDIR.${MK_BLUETOOTH}+=3Dlibbluetooth libsdp > +SUBDIR.${MK_BSNMP}+=3D libbsnmp > + > +.if !defined(COMPAT_LIBCOMPAT) > +.if ${MK_CLANG} !=3D "no" || ${MK_LLD} !=3D "no" || \ > + ${MK_LLDB} !=3D "no" || ${MK_LLVM_BINUTILS} !=3D "no" > +SUBDIR+=3D clang > +.endif > +.endif > + > +SUBDIR.${MK_CUSE}+=3D libcuse > +SUBDIR.${MK_TOOLCHAIN}+=3Dlibpe > +SUBDIR.${MK_DIALOG}+=3D libdpv libfigpar > +SUBDIR.${MK_FDT}+=3D libfdt > +SUBDIR.${MK_FILE}+=3D libmagic > +SUBDIR.${MK_GPIO}+=3D libgpio > +SUBDIR.${MK_GSSAPI}+=3D libgssapi librpcsec_gss > +SUBDIR.${MK_ICONV}+=3D libiconv_modules > +.if ${MK_MITKRB5} =3D=3D "no" > +SUBDIR.${MK_KERBEROS_SUPPORT}+=3D libcom_err > +.endif > +SUBDIR.${MK_LDNS}+=3D libldns > +SUBDIR.${MK_STATS}+=3D libstats > + > +# The libraries under libclang_rt can only be built by clang. > +.if (${COMPILER_TYPE} =3D=3D "clang" || make(clean) || make(cleandir)) = && \ > + ${MK_CLANG} !=3D "no" > +_libclang_rt=3D libclang_rt > +.elif (${MK_ASAN} !=3D "no" || ${MK_UBSAN} !=3D "no") && make(all) > +.error Requested build with sanitizers but cannot build runtime librari= es! > +.endif > + > +# This construct disables libefivar for 32-bit build. > +.if ${MACHINE_CPUARCH} !=3D "i386" > +SUBDIR.${MK_EFI}+=3D libefivar > +.endif > +SUBDIR.${MK_GOOGLETEST}+=3D googletest > +SUBDIR.${MK_NETGRAPH}+=3D libnetgraph > +SUBDIR.${MK_NIS}+=3D libypclnt > + > +.if ${MACHINE_CPUARCH} =3D=3D "i386" || ${MACHINE_CPUARCH} =3D=3D "amd6= 4" > +_libvgl=3D libvgl > +.endif > + > +.if ${MACHINE_CPUARCH} =3D=3D "aarch64" > +SUBDIR.${MK_PMC}+=3D libopencsd > +.endif > + > +.if ${MACHINE_CPUARCH} =3D=3D "amd64" > +SUBDIR.${MK_PMC}+=3D libipt > +.endif > + > +.if ${MACHINE_CPUARCH} =3D=3D "amd64" || ${MACHINE_CPUARCH} =3D=3D "aar= ch64" || \ > + ${MACHINE_CPUARCH} =3D=3D "riscv" > +SUBDIR.${MK_BHYVE}+=3D libvmmapi > +.endif > + > +.if ${MACHINE_ARCH} !=3D "powerpc" && ${MACHINE_CPUARCH} !=3D "arm" > +SUBDIR.${MK_OPENMP}+=3D libomp > +.endif > +.if ${MK_USB} !=3D "no" > +SUBDIR.${MK_OPENSSH}+=3D libcbor libfido2 > +.endif > +SUBDIR.${MK_OPENSSL}+=3D libmp > +SUBDIR.${MK_PF}+=3D libpfctl > +SUBDIR.${MK_PMC}+=3D libpmc libpmcstat > +SUBDIR.${MK_RADIUS_SUPPORT}+=3D libradius > +SUBDIR.${MK_SENDMAIL}+=3D libmilter libsm libsmdb libsmutil > +SUBDIR.${MK_TELNET}+=3D libtelnet > +SUBDIR.${MK_TESTS_SUPPORT}+=3D atf > +SUBDIR.${MK_TESTS_SUPPORT}+=3D liblutok > +SUBDIR.${MK_TESTS}+=3D tests > +SUBDIR.${MK_UNBOUND}+=3D libunbound > +SUBDIR.${MK_USB}+=3D libusbhid libusb > +SUBDIR.${MK_OFED}+=3D ofed > +SUBDIR.${MK_VERIEXEC}+=3D libveriexec > +SUBDIR.${MK_ZFS}+=3D libbe > + > +.if !make(install) > +SUBDIR_PARALLEL=3D > +.endif > + > +.include <bsd.subdir.mk> > diff --cc lib/libyaml/Makefile > index 000000000000,000000000000..6acd34f178a9 > new file mode 100644 > --- /dev/null > +++ b/lib/libyaml/Makefile > @@@ -1,0 -1,0 +1,29 @@@ > ++LIBYAML_DIR=3D ${SRCTOP}/contrib/libyaml > ++ > ++PACKAGE=3Dlib${LIB} > ++LIB=3D yaml > ++PRIVATELIB=3D true > ++SHLIB_MAJOR=3D 1 > ++SRCS=3D api.c \ > ++ dumper.c \ > ++ emitter.c \ > ++ loader.c \ > ++ parser.c \ > ++ reader.c \ > ++ scanner.c \ > ++ writer.c > ++ > ++.PATH: ${LIBYAML_DIR}/src \ > ++ ${LIBYAML_DIR}/include > ++ > ++INCS=3D yaml.h > ++ > ++WARNS?=3D 1 > ++CFLAGS+=3D -I${LIBYAML_DIR}/include \ > ++ -I${LIBYAML_DIR}/src \ > ++ -DYAML_VERSION_STRING=3D\"0.2.5\" \ > ++ -DYAML_VERSION_MAJOR=3D0 \ > ++ -DYAML_VERSION_MINOR=3D2 \ > ++ -DYAML_VERSION_PATCH=3D5 > ++ > ++.include <bsd.lib.mk> > diff --cc share/mk/src.libnames.mk > index c5ff899ac9dc,000000000000..f21d519160d2 > mode 100644,000000..100644 > --- a/share/mk/src.libnames.mk > +++ b/share/mk/src.libnames.mk > @@@ -1,917 -1,0 +1,918 @@@ > +# > +# The include file <src.libnames.mk> define library names suitable > +# for INTERNALLIB and PRIVATELIB definition > + > +.if !target(__<bsd.init.mk>__) > +.error src.libnames.mk cannot be included directly. > +.endif > + > +.if !target(__<src.libnames.mk>__) > +__<src.libnames.mk>__: .NOTMAIN > + > +.include <src.opts.mk> > + > +_PRIVATELIBS=3D \ > + atf_c \ > + atf_cxx \ > + auditd \ > + bsddialog \ > + bsdstat \ > + cbor \ > + devdctl \ > + event1 \ > + fido2 \ > + gmock \ > + gtest \ > + gmock_main \ > + gtest_main \ > + heimipcc \ > + heimipcs \ > + kldelf \ > + ldns \ > + sqlite3 \ > + ssh \ > + ucl \ > + unbound \ > ++ yaml \ > + zstd > + > +# Let projects based on FreeBSD append to _PRIVATELIBS > +# by maintaining their own LOCAL_PRIVATELIBS list. > +_PRIVATELIBS+=3D ${LOCAL_PRIVATELIBS} > + > +_INTERNALLIBS=3D \ > + amu \ > + apputils \ > + bsnmptools \ > + c_nossp_pic \ > + cron \ > + der \ > + diff \ > + elftc \ > + fdt \ > + fifolog \ > + ifconfig \ > + ipf \ > + iscsiutil \ > + kadmin_common \ > + kprop_util \ > + krb5apputils \ > + krb5ss \ > + lpr \ > + lua \ > + lutok \ > + netbsd \ > + ntp \ > + ntpevent \ > + nvmf \ > + openbsd \ > + opts \ > + parse \ > + pe \ > + pfctl \ > + pkgecc \ > + pmcstat \ > + sl \ > + sm \ > + smdb \ > + smutil \ > + telnet \ > + vers \ > + wpaap \ > + wpacommon \ > + wpacrypto \ > + wpadrivers \ > + wpaeap_common \ > + wpaeap_peer \ > + wpaeap_server \ > + wpaeapol_auth \ > + wpaeapol_supp \ > + wpal2_packet \ > + wpapasn \ > + wparadius \ > + wparsn_supp \ > + wpatls \ > + wpautils \ > + wpawps > + > +# Let projects based on FreeBSD append to _INTERNALLIBS > +# by maintaining their own LOCAL_INTERNALLIBS list. > +_INTERNALLIBS+=3D ${LOCAL_INTERNALLIBS} > + > +_LIBRARIES=3D \ > + ${_PRIVATELIBS} \ > + ${_INTERNALLIBS} \ > + ${LOCAL_LIBRARIES} \ > + 80211 \ > + 9p \ > + alias \ > + archive \ > + asn1 \ > + avl \ > + BlocksRuntime \ > + be \ > + begemot \ > + bluetooth \ > + bsdxml \ > + bsm \ > + bsnmp \ > + bz2 \ > + c \ > + c_pic \ > + calendar \ > + cam \ > + casper \ > + cap_dns \ > + cap_fileargs \ > + cap_grp \ > + cap_net \ > + cap_netdb \ > + cap_pwd \ > + cap_sysctl \ > + cap_syslog \ > + com_err \ > + compiler_rt \ > + crypt \ > + crypto \ > + ctf \ > + cuse \ > + cxxrt \ > + devctl \ > + devdctl \ > + devinfo \ > + devstat \ > + dialog \ > + dl \ > + dpv \ > + dtrace \ > + dwarf \ > + edit \ > + efivar \ > + elf \ > + execinfo \ > + fetch \ > + figpar \ > + formw \ > + geom \ > + gpio \ > + gssapi \ > + gssapi_krb5 \ > + gssrpc \ > + hdb \ > + heimbase \ > + heimntlm \ > + heimsqlite \ > + hx509 \ > + icp \ > + ipsec \ > + ipt \ > + jail \ > + k5crypto \ > + kadm5 \ > + kadmin_common \ > + kafs5 \ > + kdb5 \ > + kdc \ > + kiconv \ > + krad \ > + krb5 \ > + krb5profile \ > + krb5support \ > + kvm \ > + l \ > + lzma \ > + m \ > + magic \ > + md \ > + memstat \ > + mp \ > + mt \ > + ncursesw \ > + netgraph \ > + netmap \ > + ngatm \ > + nv \ > + nvpair \ > + opencsd \ > + pam \ > + panel \ > + panelw \ > + pcap \ > + pcsclite \ > + pjdlog \ > + pmc \ > + proc \ > + procstat \ > + pthread \ > + radius \ > + regex \ > + roken \ > + rpcsec_gss \ > + rpcsvc \ > + rt \ > + rtld_db \ > + sbuf \ > + sdp \ > + sm \ > + smb \ > + spl \ > + ssl \ > + ssp_nonshared \ > + stats \ > + stdthreads \ > + supcplusplus \ > + sys \ > + sysdecode \ > + tacplus \ > + termcapw \ > + tinfow \ > + tpool \ > + ufs \ > + ugidfw \ > + ulog \ > + umem \ > + usb \ > + usbhid \ > + util \ > + uutil \ > + verto \ > + vmmapi \ > + wind \ > + wrap \ > + xo \ > + y \ > + ypclnt \ > + z \ > + zdb \ > + zfs_core \ > + zfs \ > + zfsbootenv \ > + zpool \ > + zutil > + > +.if ${MK_KERBEROS} !=3D "no" && ${MK_MITKRB5} !=3D "no" > +_LIBRARIES+=3D \ > + kadm5clnt_mit \ > + kadm5srv_mit > +.else > +_LIBRARIES+=3D \ > + kadm5clnt \ > + kadm5srv > +.endif > + > *** 656 LINES SKIPPED *** >=20 --hzrBVIImQuW1ziHm Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEYbWI0KY5X7yH/Fy4OQX2V8rP09wFAmhdLQEACgkQOQX2V8rP 09zvbwgAgNLUrvJjNMlK1UE5h4ceokIctT1GsG31DbUa8k1bj3v1NIMh59a2FOo2 jv9yKs/MtGLrC4F2bQ+UyCTLw5OB3DeAKGhMgK6FtwzkvlyWo6PbVkBqd79VhDjv 0xhC+5wkhhqq0ZM7sbGm0x0qFR0HiD+qGoGZUKI2ihsA3l8qpEVjw2rbggU7LNTp Z8EO0ELamDARyLMIoLrfsExF4toAnlPrsBl1dJGRhtLanYuYRImNskem39gFZglv sZT9ZSMPF2SBwsuvvNiWrBBXsiPN/rYfkBB0gfAklrAS8kFDJuNpGs3qSK/pHZfb E3YnESdQi8SmfoUv30cd8Gt9lIDUAA== =a4Nq -----END PGP SIGNATURE----- --hzrBVIImQuW1ziHm--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?aF0tAlgzhgj4vMlG>