]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
time64.inc: Simplify GLIBC_64BIT_TIME_FLAGS usage
authorTom Hochstein <tom.hochstein@oss.nxp.com>
Thu, 25 Jul 2024 11:59:32 +0000 (06:59 -0500)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 26 Jul 2024 10:54:28 +0000 (11:54 +0100)
The implementation uses the append operator to include
GLIBC_64BIT_TIME_FLAGS in TARGET_CC_ARCH, but it places the space in
the GLIBC_64BIT_TIME_FLAGS assignment in order to avoid a 'spurious
space' when the value is empty.

68b50d3 time64: Remove leading whitespace from GLIBC_64BIT_TIME_FLAGS

The problem with this is it requires anyone wishing to assign a value
to GLIBC_64BIT_TIME_FLAGS to add the leading space, otherwise this is
the error:

cc1: error: '-Werror=format-security-D_TIME_BITS=64': no option '-Wformat-security-D_TIME_BITS=64'

Add a new constant variable to capture the value needed for the 32-bit
special case, including the space.

Signed-off-by: Tom Hochstein <tom.hochstein@oss.nxp.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/conf/distro/include/time64.inc

index 510da1103948ce70a4591cd5dc843e16591ba8d1..9d556bac16e1fa8bf11a3eadc79ba6d7a4988d35 100644 (file)
@@ -8,10 +8,11 @@
 #
 # Working to address those (before Y2038 rolls in) will be appreciated.
 
-GLIBC_64BIT_TIME_FLAGS = " -D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64"
+GLIBC_64BIT_TIME_FLAGS = "${GLIBC_64BIT_TIME_FLAGS_WHEN_NEEDED}"
 
 # Only needed for some 32-bit architectures, some relatively newer
 # architectures do not need it ( e.g. riscv32 )
+GLIBC_64BIT_TIME_FLAGS_WHEN_NEEDED = " -D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64"
 TARGET_CC_ARCH:append:arm = "${GLIBC_64BIT_TIME_FLAGS}"
 TARGET_CC_ARCH:append:armeb = "${GLIBC_64BIT_TIME_FLAGS}"
 TARGET_CC_ARCH:append:mipsarcho32 = "${GLIBC_64BIT_TIME_FLAGS}"