package/ibm-sw-tpm2: fix glibc build errors

In order to not have to define all architecture bitness variants in
src/LibSupport.h to conditionally define RADIX_BITS, a patch was created
to depend on LONG_BIT being defined via limits.h

For glibc, LONG_BIT is behind a _XOPEN_SOURCE define guard so patch the
makefile to define this macro as well as _DEFAULT_SOURCE.

Defining _XOPEN_SOURCE requires _DEFAULT_SOURCE to be explicitly defined
for builds to succeed as it is no longer impliclty defined when
_XOPEN_SOURCE is defined.

Fixes:
	http://autobuild.buildroot.net/results/bc145dd23c80a0660300766d0c114a00ed2e52b6/
	http://autobuild.buildroot.net/results/1d84e70c30d4d0719274aa4f3edc01772beb24a3/

Fixes: 19bd089004 ("package/ibm-sw-tpm2: fix patch to address musl builds")

Signed-off-by: Vincent Fazio <vfazio@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Vincent Fazio 2020-08-18 09:25:12 -05:00 committed by Thomas Petazzoni
parent 6f149e278a
commit a34e7f88f6

View File

@ -1,4 +1,4 @@
From 24a352fc99ebde22235b05b18615817ef7f4263c Mon Sep 17 00:00:00 2001
From 7c32c58f4ce802d2682038f73bb8c8f850237f89 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Date: Sun, 26 Apr 2020 15:33:39 +0200
Subject: [PATCH] Use LONG_BIT to define RADIX_BITS
@ -6,14 +6,17 @@ Subject: [PATCH] Use LONG_BIT to define RADIX_BITS
This allows to avoid having to support each CPU architecture
individually.
Also, add the necessary defines in the makefile to expose LONG_BIT
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Vincent Fazio <vfazio@gmail.com>
---
src/LibSupport.h | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
src/makefile | 2 ++
2 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/src/LibSupport.h b/src/LibSupport.h
index b2e6a51..f064d20 100644
index b2e6a51..0b59d18 100644
--- a/src/LibSupport.h
+++ b/src/LibSupport.h
@@ -64,20 +64,9 @@
@ -40,6 +43,19 @@ index b2e6a51..f064d20 100644
// These macros use the selected libraries to the proper include files.
#define LIB_QUOTE(_STRING_) #_STRING_
diff --git a/src/makefile b/src/makefile
index f124e78..9af1e51 100644
--- a/src/makefile
+++ b/src/makefile
@@ -46,6 +46,8 @@ CCFLAGS = -Wall \
-c -ggdb -O0 \
-DTPM_POSIX \
-D_POSIX_ \
+ -D_DEFAULT_SOURCE \
+ -D_XOPEN_SOURCE \
-DTPM_NUVOTON
# add this line for big endian platforms
--
2.25.3
2.28.0