Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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 <mail@gmelikov.ru>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #703
This commit is contained in:
Brian Behlendorf 2018-05-02 15:34:20 -07:00 committed by GitHub
parent 73d08ace52
commit 84a80d5f2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/spl-build.m4
View File

@ -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"'

3
configure.ac
View File

@ -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