|
 |
a16adc |
From b40714634099d8a6ba342397a29ca20b50128c3c Mon Sep 17 00:00:00 2001
|
|
|
a16adc |
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
|
|
|
a16adc |
Date: Thu, 16 Sep 2021 15:39:00 +0400
|
|
|
a16adc |
Subject: [PATCH] build-sys: add missing AM_CFLAGS
|
|
|
a16adc |
MIME-Version: 1.0
|
|
|
a16adc |
Content-Type: text/plain; charset=UTF-8
|
|
|
a16adc |
Content-Transfer-Encoding: 8bit
|
|
|
a16adc |
|
|
|
a16adc |
Some binaries are being built without configure time CFLAGS, fix it.
|
|
|
a16adc |
|
|
|
a16adc |
Upstream commit is cab1e2186fa6f73ffe5848362d5f7c5a2c555bdb ("build-sys:
|
|
|
a16adc |
Add MY_CFLAGS, CFLAGS, and MY_LDFLAGS to all Makefile.am's") and earlier.
|
|
|
a16adc |
|
|
|
a16adc |
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
|
a16adc |
---
|
|
|
a16adc |
src/swtpm_bios/Makefile.am | 3 ++-
|
|
|
a16adc |
src/swtpm_cert/Makefile.am | 3 ++-
|
|
|
a16adc |
src/swtpm_ioctl/Makefile.am | 3 ++-
|
|
|
a16adc |
src/swtpm_setup/Makefile.am | 3 ++-
|
|
|
a16adc |
4 files changed, 8 insertions(+), 4 deletions(-)
|
|
|
a16adc |
|
|
|
a16adc |
diff --git a/src/swtpm_bios/Makefile.am b/src/swtpm_bios/Makefile.am
|
|
|
a16adc |
index c7c3016..a6c7166 100644
|
|
|
a16adc |
--- a/src/swtpm_bios/Makefile.am
|
|
|
a16adc |
+++ b/src/swtpm_bios/Makefile.am
|
|
|
a16adc |
@@ -13,7 +13,8 @@ bin_PROGRAMS = \
|
|
|
a16adc |
swtpm_bios_CFLAGS = \
|
|
|
a16adc |
-I$(top_builddir)/include \
|
|
|
a16adc |
-I$(top_srcdir)/include \
|
|
|
a16adc |
- $(HARDENING_CFLAGS)
|
|
|
a16adc |
+ $(HARDENING_CFLAGS) \
|
|
|
a16adc |
+ @AM_CFLAGS@
|
|
|
a16adc |
|
|
|
a16adc |
swtpm_bios_LDFLAGS = \
|
|
|
a16adc |
$(HARDENING_LDFLAGS)
|
|
|
a16adc |
diff --git a/src/swtpm_cert/Makefile.am b/src/swtpm_cert/Makefile.am
|
|
|
a16adc |
index bf0d8b7..74e4d2a 100644
|
|
|
a16adc |
--- a/src/swtpm_cert/Makefile.am
|
|
|
a16adc |
+++ b/src/swtpm_cert/Makefile.am
|
|
|
a16adc |
@@ -18,7 +18,8 @@ swtpm_cert_SOURCES = \
|
|
|
a16adc |
|
|
|
a16adc |
swtpm_cert_CFLAGS = \
|
|
|
a16adc |
-I$(top_builddir)/include \
|
|
|
a16adc |
- -I$(top_srcdir)/include
|
|
|
a16adc |
+ -I$(top_srcdir)/include \
|
|
|
a16adc |
+ @AM_CFLAGS@
|
|
|
a16adc |
|
|
|
a16adc |
ek-cert.o : tpm_asn1.h
|
|
|
a16adc |
|
|
|
a16adc |
diff --git a/src/swtpm_ioctl/Makefile.am b/src/swtpm_ioctl/Makefile.am
|
|
|
a16adc |
index cc8388c..3b722bd 100644
|
|
|
a16adc |
--- a/src/swtpm_ioctl/Makefile.am
|
|
|
a16adc |
+++ b/src/swtpm_ioctl/Makefile.am
|
|
|
a16adc |
@@ -14,7 +14,8 @@ swtpm_ioctl_SOURCES = tpm_ioctl.c
|
|
|
a16adc |
swtpm_ioctl_CFLAGS = \
|
|
|
a16adc |
-I$(top_builddir)/include \
|
|
|
a16adc |
-I$(top_srcdir)/include \
|
|
|
a16adc |
- $(HARDENING_CFLAGS)
|
|
|
a16adc |
+ $(HARDENING_CFLAGS) \
|
|
|
a16adc |
+ @AM_CFLAGS@
|
|
|
a16adc |
|
|
|
a16adc |
swtpm_ioctl_LDFLAGS = \
|
|
|
a16adc |
$(HARDENING_LDFLAGS)
|
|
|
a16adc |
diff --git a/src/swtpm_setup/Makefile.am b/src/swtpm_setup/Makefile.am
|
|
|
a16adc |
index 045bdb1..5696dde 100644
|
|
|
a16adc |
--- a/src/swtpm_setup/Makefile.am
|
|
|
a16adc |
+++ b/src/swtpm_setup/Makefile.am
|
|
|
a16adc |
@@ -40,7 +40,8 @@ swtpm_setup_CFLAGS = \
|
|
|
a16adc |
-I$(top_srcdir)/src/utils \
|
|
|
a16adc |
$(HARDENING_CFLAGS) \
|
|
|
a16adc |
$(GLIB_CFLAGS) \
|
|
|
a16adc |
- $(JSON_GLIB_CFLAGS)
|
|
|
a16adc |
+ $(JSON_GLIB_CFLAGS) \
|
|
|
a16adc |
+ @AM_CFLAGS@
|
|
|
a16adc |
|
|
|
a16adc |
EXTRA_DIST = \
|
|
|
a16adc |
README
|
|
|
a16adc |
--
|
|
|
a16adc |
2.33.0.113.g6c40894d24
|
|
|
a16adc |
|