Changes in Makefile.libcompat

834f73d2 - build{libcompat}: Pass UNIVERSE_TOOLCHAIN_PATH to the _lc_build-tools submake

Tue, 22 Aug 2023 04:00:45 +0000

build{libcompat}: Pass UNIVERSE_TOOLCHAIN_PATH to the _lc_build-tools submakeThis fixes make UNIVERSE_TOOLCHAIN=yes with libcompats.Reviewed by: jrtc27Differential Revision: https://reviews.freebsd.org/D41535 List of files: /freebsd-14.2/Makefile.libcompat

d0b2dbfa - Remove $FreeBSD$: one-line sh pattern

Wed, 16 Aug 2023 17:55:03 +0000

Remove $FreeBSD$: one-line sh patternRemove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/ List of files: /freebsd-14.2/Makefile.libcompat

8aaa1230 - Makefile.libcompat: Fix DTRACE variable

Thu, 10 Aug 2023 23:48:01 +0000

Makefile.libcompat: Fix DTRACE variableBack when Makefile.lib32 was turned into Makefile.libcompat, a typo wasintroduced; it should have been LIBCOMPATDTRACE, but instead gained adollar sign in it as LIB$COMPATDTRACE (and with COMPATDTRACE not beingdefined, was equivalent to ${LIB:U${DTRACE}}). This then meant it wasnot converted to LIB${_LIBCOMPAT}DTRACE in 91d7edd549f5 ("Generaliselibcompat to be a list rather than a single option") and instead leftbroken. Belatedly fix this long-standing seemingly-inconsequential bug.Fixes: dba75e9fa5a9 ("Move Makefile.lib32 to Makefile.libcompat and generalize it.") List of files: /freebsd-14.2/Makefile.libcompat

1c024976 - Makefile.inc1: Enable requesting the universe toolchain.

Tue, 01 Aug 2023 21:01:57 +0000

Makefile.inc1: Enable requesting the universe toolchain.make universe builds a cross toolchain under HOST_OBJTMP/tmp via theuniverse-toolchain target. However, doing a plain 'make buildworld'after a universe/tinderbox run (e.g. to reproduce a failure and testthe fix for it), will try to build a new cross toolchain underOBJTMP/tmp which can be tedious. This commit adds a make variable(UNIVERSE_TOOLCHAIN) which can be used similar to CROSS_TOOLCHAIN torequest an external toolchain. If this variable is set (value doesn'tmatter), the the universe toolchain is used as an external toolchain.Reviewed by: impDifferential Revision: https://reviews.freebsd.org/D40777 List of files: /freebsd-14.2/Makefile.libcompat

a1b67573 - arm64 lib32: enable building of lib32 on arm64

Tue, 25 Jul 2023 23:59:52 +0000

arm64 lib32: enable building of lib32 on arm64Enable LIB32 option on aarch64, defaulting to YES; it had defaultedto "broken". Add required variables for how to compile lib32 onarm. Use /usr/include/arm for armv7 (32-bit) headers, analogous to/usr/include/i386 on amd64. Omit libomp from lib32; it is notsupported on armv7.Reviewed by: jrtc27Differential Revision: https://reviews.freebsd.org/D40945 List of files: /freebsd-14.2/Makefile.libcompat

5d4f8df4 - Makefile.libcompat: Make quoting for CC/CXX/CPP more future-proof

Fri, 14 Jul 2023 04:34:03 +0000

Makefile.libcompat: Make quoting for CC/CXX/CPP more future-proofbmake's :Q is for quoting outside of double quotes, but here is insidedouble quotes, and as a result it ends up quoting characters that don'thave a special meaning inside double quotes. On the surface this wouldseem harmless, but POSIX sh has a strange behaviour (differing fromoutside double quotes) that, inside double quotes, a backslash before acharacter that never has a special meaning inside double quotes ispassed through. As a result, should LIB${_LIBCOMPAT}CFLAGS containsomething like -DFOO$x$=x, we would form "... -DFOO\\$x\\$=x ...",which would be parsed as -DFOO\$x\$=x, since the parentheses are neverspecial inside double quotes (but the backslash itself is), not theoriginal -DFOO$x$=x as intended.Instead, construct the whole string as a bmake expression and use :Q onthat, without the manual double quotes around everything. Note that the:L modifier lets you treat an expression like a variable expansion andapply modifiers to it, i.e. ${expr:L:...} is the same as tmp=expr${tmp:...} (in essence, ignoring possible differences due to deferredsubstitution).Improves: 537f945fc89f ("Makefile.libcompat: Quote CFLAGS and CXXFLAGS for sub-make") List of files: /freebsd-14.2/Makefile.libcompat

0a5e35a7 - Makefile.libcompat: Be consistent about not installing includes

Fri, 14 Jul 2023 01:36:04 +0000

Makefile.libcompat: Be consistent about not installing includesCurrently we only pass MK_INCLUDES=no for distribute and install, sinceit's only in LIB${_LIBCOMPAT}IMAKE, which means that we enable includesduring libraries and thus install includes into worldtmp, despite itbeing shared these days across native and libcompats. This also meanswe're at risk of having headers needed for building against a libcompatthat don't get installed to the system, but do end up being installed toworldtmp. In particular, lib/msun has different fenv.h for aarch64 andarm, so aarch64 will need arm's copy when it grows lib32 support, andthis would be installed to worldtmp, but not to the system, meaning anyprograms that use fenv.h wouldn't be able to be built.Instead, be consistent, and don't install includes at all during any ofthe libcompat phases, so that we can detect these issues and ensure anyneeded headers are installed for both worldtmp and the system.Reviewed by: brooksDifferential Revision: https://reviews.freebsd.org/D41030 List of files: /freebsd-14.2/Makefile.libcompat

537f945f - Makefile.libcompat: Quote CFLAGS and CXXFLAGS for sub-make

Sun, 09 Jul 2023 17:46:12 +0000

Makefile.libcompat: Quote CFLAGS and CXXFLAGS for sub-makeCurrently none of the words in these require quoting, but a futurecommit will add words that do, thus we should make sure to quote eachword so the shell doesn't mangle them before calling the sub-make.(Note that :@var@expr@ is the bmake syntax for map, replacing each wordwith expr's evaluation, with var containing the input word)Reviewed by: emaste, brooks, jhbDifferential Revision: https://reviews.freebsd.org/D40921 List of files: /freebsd-14.2/Makefile.libcompat

91d7edd5 - Generalise libcompat to be a list rather than a single option

Tue, 27 Jun 2023 23:10:49 +0000

Generalise libcompat to be a list rather than a single optionWhilst the kernel can support any number of COMPAT_FOO, world can onlybuild a single libfoo. Upstream this isn't such an issue, since the onlyoption is lib32 anyway, but downstreams, such as CheriBSD, may wish tosupport multiple at the same time. Thus, adjust the top-level Makefilesto turn _LIBCOMPAT into a _LIBCOMPATS list that gets iterated over, andadjust bsd.compat.mk to support this use-case.For the normal NEED_COMPAT/WANT_COMPAT case, LIBCOMPATFOO remain set andrefer to the requested compat's, preserving the current interface. Forthe top-level Makefiles those variables are no longer set (since thereis no longer "the" compat) and only the per-compat ones are available.Reviewed by: brooks, jhb, impDifferential Revision: https://reviews.freebsd.org/D40571 List of files: /freebsd-14.2/Makefile.libcompat

10afc5ea - Makefile.libcompat: Handle MK_FOO varying for native and compat arches

Tue, 27 Jun 2023 23:10:30 +0000

Makefile.libcompat: Handle MK_FOO varying for native and compat archesCurrently Makefile.libcompat queries a few MK_FOO variables to determinewhat is being built. However, it is plausible (and indeed, downstreamin CheriBSD, this is the case) that these may vary between the nativeand the compat architecture. In order to correctly determine theirvalues for the compat architecture, we need to defer their evaluationuntil we are in the compat sub-make where src.opts.mk will give us theright value for the compat MACHINE_ARCH.Reviewed by: brooks, jhb, impObtained from: CheriBSDDifferential Revision: https://reviews.freebsd.org/D40570 List of files: /freebsd-14.2/Makefile.libcompat

5ed85151 - Makefile.libcompat: Remove unused _LC_INCDIRS

Tue, 27 Jun 2023 23:09:44 +0000

Makefile.libcompat: Remove unused _LC_INCDIRSThis is no longer referenced as of commit 724123b9f4d3 ("libcompat: UseWORLDTMP sysroot").Reviewed by: brooks, jhb, impDifferential Revision: https://reviews.freebsd.org/D40569 List of files: /freebsd-14.2/Makefile.libcompat

227f47ce - libcompat: avoid installing include files twice

Thu, 17 Nov 2022 00:12:18 +0000

libcompat: avoid installing include files twicePreviously some headers were getting installed twice, once as expectedand then a second time as part of the compat32 library stage.Makefile.libcompat sets -DLIBRARIES_ONLY for the install make invocationwhich causes bsd.lib.mk to skip headers. However some headers arehandled via bsd.prog.mk, which does not use LIBRARIES_ONLY. Explicitlyset MK_INCLUDES=no.Reviewed by: brooksSponsored by: The FreeBSD FoundationDifferential Revision: https://reviews.freebsd.org/D37413 List of files: /freebsd-14.2/Makefile.libcompat

ac175bd3 - Install working pkgconfig .pc files for compat libraries

Thu, 11 Aug 2022 22:17:52 +0000

Install working pkgconfig .pc files for compat librariesThe default ones are install them to /usr/libdata/pkgconfig, and we can'tuse this path for compat libraries, so we use /usr/lib/pkgconfigi here.Test Plan: grep -rn libdir= ./usr/lib32/pkgconfig/*.pcMFC after: 1 weekDifferential Revision: https://reviews.freebsd.org/D34939 List of files: /freebsd-14.2/Makefile.libcompat

724123b9 - libcompat: Use WORLDTMP sysroot

Fri, 01 Jul 2022 07:33:16 +0000

libcompat: Use WORLDTMP sysrootNow that -m32 is fixed, just install libs in ${WORLDTMP}/lib/lib32and use the installed headers.Reviewed by: imp, jhbObtained from: CheriBSDDifferential Revision: https://reviews.freebsd.org/D34697 List of files: /freebsd-14.2/Makefile.libcompat

03f6e182 - Makefile.libcompat: Sort

Wed, 02 Feb 2022 21:34:29 +0000

Makefile.libcompat: SortSort MK_BOOT before MK_CTF and remove now-useless NO_LINT while I'mhere.Suggested by: brooks, emasteSponsored by: Netflix List of files: /freebsd-14.2/Makefile.libcompat

03475562 - stand: Fix kboot issue on powerpc64 with MK_LIB32=yes

Wed, 02 Feb 2022 21:27:56 +0000

stand: Fix kboot issue on powerpc64 with MK_LIB32=yesWhen MK_LIB32 is true, we descend into stand for make includes, makeclean, etc. We shouldn't do this, so set MK_BOOT=no when we're buildingincludes.Fixes: 6497250f6f7fPR: 261497Sponsored by: NetflixReviewed by: emaste, brooks (he suggested this)Differential Revision: https://reviews.freebsd.org/D34141 List of files: /freebsd-14.2/Makefile.libcompat

aada8c47 - libcompat: Remove MIPS from list of compat libraries

Thu, 09 Dec 2021 15:22:51 +0000

libcompat: Remove MIPS from list of compat librariesSponsored by: Netflix List of files: /freebsd-14.2/Makefile.libcompat

cc46927f - ncurses: fix libcompat (lib32 for example) building

Mon, 04 Oct 2021 12:16:32 +0000

ncurses: fix libcompat (lib32 for example) building List of files: /freebsd-14.2/Makefile.libcompat

61ed578e - Prefer MK_SSP=no to SSP_CFLAGS=

Wed, 04 Aug 2021 18:20:50 +0000

Prefer MK_SSP=no to SSP_CFLAGS=It is more idiomatic. CFLAGS is only augmented with $SSP_CFLAGS when$MK_SSP != "no".Reviewed by: impMFC after: 1 weekDifferential Revision: https://reviews.freebsd.org/D31401 List of files: /freebsd-14.2/Makefile.libcompat

bcd2f41f - mk: format some option lists

Wed, 04 Aug 2021 18:17:34 +0000

mk: format some option listsAlphabetize and give each option its own line, ahead of making anotherchange to these lists. This makes future diffs easier to read.Reviewed by: imp, emasteMFC after: 1 weekDifferential Revision: https://reviews.freebsd.org/D31399 List of files: /freebsd-14.2/Makefile.libcompat