diff options
| author | Brian Behlendorf <[email protected]> | 2012-02-27 10:12:40 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2012-02-27 14:08:17 -0800 |
| commit | 4b787d75c869a7f633607ecb17f3a7c482a553d2 (patch) | |
| tree | 39cc219f9493f31fee7203ac6ee8a54fed4d290f /include/sys | |
| parent | 570827e129ed81e066e894530bbe24642f473154 (diff) | |
Cleanly support debug packages
Allow a source rpm to be rebuilt with debugging enabled. This
avoids the need to have to manually modify the spec file. By
default debugging is still largely disabled. To enable specific
debugging features use the following options with rpmbuild.
'--with debug' - Enables ASSERTs
# For example:
$ rpmbuild --rebuild --with debug zfs-modules-0.6.0-rc6.src.rpm
Additionally, ZFS_CONFIG has been added to zfs_config.h for
packages which build against these headers. This is critical
to ensure both zfs and the dependant package are using the same
prototype and structure definitions.
Signed-off-by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'include/sys')
| -rw-r--r-- | include/sys/Makefile.in | 1 | ||||
| -rw-r--r-- | include/sys/fm/Makefile.in | 1 | ||||
| -rw-r--r-- | include/sys/fm/fs/Makefile.in | 1 | ||||
| -rw-r--r-- | include/sys/fs/Makefile.in | 1 | ||||
| -rw-r--r-- | include/sys/zfs_debug.h | 2 |
5 files changed, 5 insertions, 1 deletions
diff --git a/include/sys/Makefile.in b/include/sys/Makefile.in index 91fd34b65..a2afe1422 100644 --- a/include/sys/Makefile.in +++ b/include/sys/Makefile.in @@ -338,6 +338,7 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_CFLAGS = @DEBUG_CFLAGS@ DEBUG_STACKFLAGS = @DEBUG_STACKFLAGS@ +DEBUG_ZFS = @DEBUG_ZFS@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ diff --git a/include/sys/fm/Makefile.in b/include/sys/fm/Makefile.in index 0dcd27b10..9fe283acf 100644 --- a/include/sys/fm/Makefile.in +++ b/include/sys/fm/Makefile.in @@ -198,6 +198,7 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_CFLAGS = @DEBUG_CFLAGS@ DEBUG_STACKFLAGS = @DEBUG_STACKFLAGS@ +DEBUG_ZFS = @DEBUG_ZFS@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ diff --git a/include/sys/fm/fs/Makefile.in b/include/sys/fm/fs/Makefile.in index 03c32de06..bc2db281f 100644 --- a/include/sys/fm/fs/Makefile.in +++ b/include/sys/fm/fs/Makefile.in @@ -158,6 +158,7 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_CFLAGS = @DEBUG_CFLAGS@ DEBUG_STACKFLAGS = @DEBUG_STACKFLAGS@ +DEBUG_ZFS = @DEBUG_ZFS@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ diff --git a/include/sys/fs/Makefile.in b/include/sys/fs/Makefile.in index 1f8de0f07..00ed240c6 100644 --- a/include/sys/fs/Makefile.in +++ b/include/sys/fs/Makefile.in @@ -158,6 +158,7 @@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ DEBUG_CFLAGS = @DEBUG_CFLAGS@ DEBUG_STACKFLAGS = @DEBUG_STACKFLAGS@ +DEBUG_ZFS = @DEBUG_ZFS@ DEFAULT_INIT_DIR = @DEFAULT_INIT_DIR@ DEFAULT_INIT_SCRIPT = @DEFAULT_INIT_SCRIPT@ DEFAULT_PACKAGE = @DEFAULT_PACKAGE@ diff --git a/include/sys/zfs_debug.h b/include/sys/zfs_debug.h index e83b66147..591d0df8f 100644 --- a/include/sys/zfs_debug.h +++ b/include/sys/zfs_debug.h @@ -36,7 +36,7 @@ /* * ZFS debugging - Always enabled for user space builds. */ -#if defined(DEBUG) || !defined(_KERNEL) +#if !defined(ZFS_DEBUG) && !defined(_KERNEL) #define ZFS_DEBUG #endif |