| Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 1 | From 3e701d6274924adaed568e22af2362aa5af1f055 Mon Sep 17 00:00:00 2001 |
| 2 | From: Peter Seebach <peter.seebach@windriver.com> |
| 3 | Date: Sun, 8 Jan 2023 23:01:28 +0800 |
| 4 | Subject: [PATCH] Fix quoting for BUILD_WITH |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 5 | |
| 6 | The escaped quotes are to make the -D values produce strings which |
| 7 | can be used to display these values. However, if the values are more |
| 8 | than one word, with spaces, they also need shell quoting to make them |
| 9 | into single words. |
| 10 | |
| 11 | Upstream-Status: Pending |
| 12 | |
| 13 | Signed-off-by: Peter Seebach <peter.seebach@windriver.com> |
| 14 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
| 15 | --- |
| 16 | src/main/libfreeradius-server.mk | 2 +- |
| 17 | src/main/unittest.mk | 2 +- |
| 18 | src/modules/rlm_eap/radeapclient.mk | 2 +- |
| 19 | 3 files changed, 3 insertions(+), 3 deletions(-) |
| 20 | |
| 21 | diff --git a/src/main/libfreeradius-server.mk b/src/main/libfreeradius-server.mk |
| Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 22 | index 4495f72481..07c28f1968 100644 |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 23 | --- a/src/main/libfreeradius-server.mk |
| 24 | +++ b/src/main/libfreeradius-server.mk |
| 25 | @@ -18,5 +18,5 @@ SOURCES := conffile.c \ |
| 26 | TGT_LDLIBS := $(OPENSSL_LIBS) |
| 27 | |
| 28 | ifneq ($(MAKECMDGOALS),scan) |
| 29 | -SRC_CFLAGS += -DBUILT_WITH_CPPFLAGS=\"$(CPPFLAGS)\" -DBUILT_WITH_CFLAGS=\"$(CFLAGS)\" -DBUILT_WITH_LDFLAGS=\"$(LDFLAGS)\" -DBUILT_WITH_LIBS=\"$(LIBS)\" |
| 30 | +SRC_CFLAGS += -DBUILT_WITH_CPPFLAGS="\"$(CPPFLAGS)\"" -DBUILT_WITH_CFLAGS="\"$(CFLAGS)\"" -DBUILT_WITH_LDFLAGS="\"$(LDFLAGS)\"" -DBUILT_WITH_LIBS="\"$(LIBS)\"" |
| 31 | endif |
| 32 | diff --git a/src/main/unittest.mk b/src/main/unittest.mk |
| Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 33 | index edd4f133a7..b5b44d5e11 100644 |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 34 | --- a/src/main/unittest.mk |
| 35 | +++ b/src/main/unittest.mk |
| 36 | @@ -21,5 +21,5 @@ TGT_PREREQS += libfreeradius-eap.a |
| 37 | endif |
| 38 | |
| 39 | ifneq ($(MAKECMDGOALS),scan) |
| 40 | -SRC_CFLAGS += -DBUILT_WITH_CPPFLAGS=\"$(CPPFLAGS)\" -DBUILT_WITH_CFLAGS=\"$(CFLAGS)\" -DBUILT_WITH_LDFLAGS=\"$(LDFLAGS)\" -DBUILT_WITH_LIBS=\"$(LIBS)\" |
| 41 | +SRC_CFLAGS += -DBUILT_WITH_CPPFLAGS="\"$(CPPFLAGS)\"" -DBUILT_WITH_CFLAGS="\"$(CFLAGS)\"" -DBUILT_WITH_LDFLAGS="\"$(LDFLAGS)\"" -DBUILT_WITH_LIBS="\"$(LIBS)\"" |
| 42 | endif |
| 43 | diff --git a/src/modules/rlm_eap/radeapclient.mk b/src/modules/rlm_eap/radeapclient.mk |
| Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 44 | index 6068f54813..7d3c55625b 100644 |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 45 | --- a/src/modules/rlm_eap/radeapclient.mk |
| 46 | +++ b/src/modules/rlm_eap/radeapclient.mk |
| 47 | @@ -23,7 +23,7 @@ SRC_CFLAGS += -DWITH_EAPCLIENT |
| 48 | SRC_INCDIRS := ${top_srcdir}/src/modules/rlm_eap/libeap |
| 49 | |
| 50 | ifneq ($(MAKECMDGOALS),scan) |
| 51 | -SRC_CFLAGS += -DBUILT_WITH_CPPFLAGS=\"$(CPPFLAGS)\" -DBUILT_WITH_CFLAGS=\"$(CFLAGS)\" -DBUILT_WITH_LDFLAGS=\"$(LDFLAGS)\" -DBUILT_WITH_LIBS=\"$(LIBS)\" |
| 52 | +SRC_CFLAGS += -DBUILT_WITH_CPPFLAGS="\"$(CPPFLAGS)\"" -DBUILT_WITH_CFLAGS="\"$(CFLAGS)\"" -DBUILT_WITH_LDFLAGS="\"$(LDFLAGS)\"" -DBUILT_WITH_LIBS="\"$(LIBS)\"" |
| 53 | endif |
| 54 | |
| 55 | endif |
| 56 | -- |
| Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 57 | 2.25.1 |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 58 | |