diff options
| author | Brian Behlendorf <[email protected]> | 2018-05-02 15:34:20 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-05-02 15:34:20 -0700 |
| commit | 84a80d5f2d14fdfd16d440eef2e3d6e756a1165c (patch) | |
| tree | 729cbceb1295ac31c40fed0402437795d27d05ce | |
| parent | 73d08ace523fc3964852e4e82eae3f2db70354d4 (diff) | |
Fix undefined RPM macros
Always invoke the SPL_AC_DEBUG* macro's when running configure
so RPM_DEFINE_COMMON is correctly expanded. A similar change
was already applied to ZFS.
Reviewed-by: George Melikov <[email protected]>
Reviewed-by: Tony Hutter <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #703
| -rw-r--r-- | config/spl-build.m4 | 7 | ||||
| -rw-r--r-- | configure.ac | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/config/spl-build.m4 b/config/spl-build.m4 index 9c97e64f9..5c6c02af2 100644 --- a/config/spl-build.m4 +++ b/config/spl-build.m4 @@ -17,9 +17,6 @@ AC_DEFUN([SPL_AC_CONFIG_KERNEL], [ KERNELCPPFLAGS="$KERNELCPPFLAGS -Wstrict-prototypes" AC_SUBST(KERNELCPPFLAGS) - SPL_AC_DEBUG - SPL_AC_DEBUG_KMEM - SPL_AC_DEBUG_KMEM_TRACKING SPL_AC_TEST_MODULE SPL_AC_ATOMIC_SPINLOCK SPL_AC_SHRINKER_CALLBACK @@ -228,7 +225,9 @@ AC_DEFUN([SPL_AC_RPM], [ AC_MSG_RESULT([$HAVE_RPMBUILD]) ]) - RPM_DEFINE_COMMON='--define "$(DEBUG_SPL) 1" --define "$(DEBUG_KMEM) 1" --define "$(DEBUG_KMEM_TRACKING) 1"' + RPM_DEFINE_COMMON='--define "$(DEBUG_SPL) 1"' + RPM_DEFINE_COMMON+=' --define "$(DEBUG_KMEM) 1"' + RPM_DEFINE_COMMON+=' --define "$(DEBUG_KMEM_TRACKING) 1"' RPM_DEFINE_UTIL= RPM_DEFINE_KMOD='--define "kernels $(LINUX_VERSION)"' RPM_DEFINE_KMOD+=' --define "_wrong_version_format_terminate_build 0"' diff --git a/configure.ac b/configure.ac index 59ee3ca0b..ab53879e7 100644 --- a/configure.ac +++ b/configure.ac @@ -46,6 +46,9 @@ AC_PROG_LIBTOOL SPL_AC_LICENSE SPL_AC_PACKAGE SPL_AC_CONFIG +SPL_AC_DEBUG +SPL_AC_DEBUG_KMEM +SPL_AC_DEBUG_KMEM_TRACKING AC_CONFIG_FILES([ Makefile |