ipackage/cdrkit: fix namespace of variables
PATCH 1/1 ipackage/cdrkit: fix namespace of variables
Not all cdrkit variables are prefixed with CDRKIT_, so they leak.
Most importantly, they look like they belong to another package's namespace, cmake, as they start with CMAKE_ (but fortunately, they have no impact on cmake, as they are not used by our infras.)
Fix that by removing the intermediate variables, and directly set the CDRKIT_CONF_OPT variable.
--- package/cdrkit/cdrkit.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
package/cdrkit/cdrkit.mk +2 -4
@@ -11,13 +11,11 @@ CDRKIT_LICENSE = GPLv2 CDRKIT_LICENSE_FILES = COPYING ifeq ($(BR2_ENDIAN),"BIG") -CMAKE_ENDIAN_OPT=-DBITFIELDS_HTOL=1 +CDRKIT_CONF_OPT += -DBITFIELDS_HTOL=1 else -CMAKE_ENDIAN_OPT=-DBITFIELDS_HTOL=0 +CDRKIT_CONF_OPT += -DBITFIELDS_HTOL=0 endif -CDRKIT_CONF_OPT += $(CMAKE_ENDIAN_OPT) - ## cdrkit isn't completely re-rooted by CMAKE_FIND_ROOT_PATH, so add ## some extra flags so it finds needed libs and headers. CDRKIT_CONF_OPT += -DCMAKE_C_FLAGS="-I$(STAGING_DIR)/usr/include"
Signature · 1 line
1.9.1
PATCH 1/1 ipackage/cdrkit: fix namespace of variables
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Yann" == Yann E MORIN <[email protected]> writes:
Not all cdrkit variables are prefixed with
CDRKIT_, so they leak. Most importantly, they look like they belong to another package's namespace, cmake, as they start withCMAKE_(but fortunately, they have no impact on cmake, as they are not used by our infras.)
Quoted 6 lines
Fix that by removing the intermediate variables, and directly set the
CDRKIT_CONF_OPTvariable.Signed-off-by "Yann E. MORIN" <[email protected]>Cc Thomas De Schampheleire <[email protected]>Cc Thomas Petazzoni <[email protected]>
Committed with $SUBJECT fixed, thanks.
Signature · 1 line
Bye, Peter Korsgaard