Merge commit 'refs/top-bases/top' into top
This commit is contained in:
commit
db0831d954
|
@ -206,8 +206,8 @@ target_vendor = @target_vendor@
|
||||||
# FIXME: consider removing this as soon as we reasonably can.
|
# FIXME: consider removing this as soon as we reasonably can.
|
||||||
|
|
||||||
# Expected defines not covered by zfs_config.h or spl_config.h
|
# Expected defines not covered by zfs_config.h or spl_config.h
|
||||||
AM_FLAGS = -ggdb -O2 -std=c99 -Wall -Wstrict-prototypes -Wshadow \
|
AM_CFLAGS = -ggdb -O2 -std=c99 -Wall -Wstrict-prototypes -Wshadow \
|
||||||
-Wno-switch -Wno-unused -Wno-missing-braces \
|
-Werror -Wno-switch -Wno-unused -Wno-missing-braces \
|
||||||
-Wno-unknown-pragmas -Wno-parentheses -Wno-uninitialized \
|
-Wno-unknown-pragmas -Wno-parentheses -Wno-uninitialized \
|
||||||
-fno-strict-aliasing -D_GNU_SOURCE -D__EXTENSIONS__ \
|
-fno-strict-aliasing -D_GNU_SOURCE -D__EXTENSIONS__ \
|
||||||
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
|
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
|
||||||
|
|
|
@ -206,8 +206,8 @@ target_vendor = @target_vendor@
|
||||||
# FIXME: consider removing this as soon as we reasonably can.
|
# FIXME: consider removing this as soon as we reasonably can.
|
||||||
|
|
||||||
# Expected defines not covered by zfs_config.h or spl_config.h
|
# Expected defines not covered by zfs_config.h or spl_config.h
|
||||||
AM_FLAGS = -ggdb -O2 -std=c99 -Wall -Wstrict-prototypes -Wshadow \
|
AM_CFLAGS = -ggdb -O2 -std=c99 -Wall -Wstrict-prototypes -Wshadow \
|
||||||
-Wno-switch -Wno-unused -Wno-missing-braces \
|
-Werror -Wno-switch -Wno-unused -Wno-missing-braces \
|
||||||
-Wno-unknown-pragmas -Wno-parentheses -Wno-uninitialized \
|
-Wno-unknown-pragmas -Wno-parentheses -Wno-uninitialized \
|
||||||
-fno-strict-aliasing -D_GNU_SOURCE -D__EXTENSIONS__ \
|
-fno-strict-aliasing -D_GNU_SOURCE -D__EXTENSIONS__ \
|
||||||
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
|
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
|
||||||
|
|
|
@ -206,8 +206,8 @@ target_vendor = @target_vendor@
|
||||||
# FIXME: consider removing this as soon as we reasonably can.
|
# FIXME: consider removing this as soon as we reasonably can.
|
||||||
|
|
||||||
# Expected defines not covered by zfs_config.h or spl_config.h
|
# Expected defines not covered by zfs_config.h or spl_config.h
|
||||||
AM_FLAGS = -ggdb -O2 -std=c99 -Wall -Wstrict-prototypes -Wshadow \
|
AM_CFLAGS = -ggdb -O2 -std=c99 -Wall -Wstrict-prototypes -Wshadow \
|
||||||
-Wno-switch -Wno-unused -Wno-missing-braces \
|
-Werror -Wno-switch -Wno-unused -Wno-missing-braces \
|
||||||
-Wno-unknown-pragmas -Wno-parentheses -Wno-uninitialized \
|
-Wno-unknown-pragmas -Wno-parentheses -Wno-uninitialized \
|
||||||
-fno-strict-aliasing -D_GNU_SOURCE -D__EXTENSIONS__ \
|
-fno-strict-aliasing -D_GNU_SOURCE -D__EXTENSIONS__ \
|
||||||
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
|
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
|
||||||
|
|
|
@ -206,8 +206,8 @@ target_vendor = @target_vendor@
|
||||||
# FIXME: consider removing this as soon as we reasonably can.
|
# FIXME: consider removing this as soon as we reasonably can.
|
||||||
|
|
||||||
# Expected defines not covered by zfs_config.h or spl_config.h
|
# Expected defines not covered by zfs_config.h or spl_config.h
|
||||||
AM_FLAGS = -ggdb -O2 -std=c99 -Wall -Wstrict-prototypes -Wshadow \
|
AM_CFLAGS = -ggdb -O2 -std=c99 -Wall -Wstrict-prototypes -Wshadow \
|
||||||
-Wno-switch -Wno-unused -Wno-missing-braces \
|
-Werror -Wno-switch -Wno-unused -Wno-missing-braces \
|
||||||
-Wno-unknown-pragmas -Wno-parentheses -Wno-uninitialized \
|
-Wno-unknown-pragmas -Wno-parentheses -Wno-uninitialized \
|
||||||
-fno-strict-aliasing -D_GNU_SOURCE -D__EXTENSIONS__ \
|
-fno-strict-aliasing -D_GNU_SOURCE -D__EXTENSIONS__ \
|
||||||
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
|
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
|
||||||
|
|
|
@ -207,8 +207,8 @@ target_vendor = @target_vendor@
|
||||||
# FIXME: consider removing this as soon as we reasonably can.
|
# FIXME: consider removing this as soon as we reasonably can.
|
||||||
|
|
||||||
# Expected defines not covered by zfs_config.h or spl_config.h
|
# Expected defines not covered by zfs_config.h or spl_config.h
|
||||||
AM_FLAGS = -ggdb -O2 -std=c99 -Wall -Wstrict-prototypes -Wshadow \
|
AM_CFLAGS = -ggdb -O2 -std=c99 -Wall -Wstrict-prototypes -Wshadow \
|
||||||
-Wno-switch -Wno-unused -Wno-missing-braces \
|
-Werror -Wno-switch -Wno-unused -Wno-missing-braces \
|
||||||
-Wno-unknown-pragmas -Wno-parentheses -Wno-uninitialized \
|
-Wno-unknown-pragmas -Wno-parentheses -Wno-uninitialized \
|
||||||
-fno-strict-aliasing -D_GNU_SOURCE -D__EXTENSIONS__ \
|
-fno-strict-aliasing -D_GNU_SOURCE -D__EXTENSIONS__ \
|
||||||
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
|
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
|
||||||
|
|
|
@ -207,8 +207,8 @@ target_vendor = @target_vendor@
|
||||||
# FIXME: consider removing this as soon as we reasonably can.
|
# FIXME: consider removing this as soon as we reasonably can.
|
||||||
|
|
||||||
# Expected defines not covered by zfs_config.h or spl_config.h
|
# Expected defines not covered by zfs_config.h or spl_config.h
|
||||||
AM_FLAGS = -ggdb -O2 -std=c99 -Wall -Wstrict-prototypes -Wshadow \
|
AM_CFLAGS = -ggdb -O2 -std=c99 -Wall -Wstrict-prototypes -Wshadow \
|
||||||
-Wno-switch -Wno-unused -Wno-missing-braces \
|
-Werror -Wno-switch -Wno-unused -Wno-missing-braces \
|
||||||
-Wno-unknown-pragmas -Wno-parentheses -Wno-uninitialized \
|
-Wno-unknown-pragmas -Wno-parentheses -Wno-uninitialized \
|
||||||
-fno-strict-aliasing -D_GNU_SOURCE -D__EXTENSIONS__ \
|
-fno-strict-aliasing -D_GNU_SOURCE -D__EXTENSIONS__ \
|
||||||
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
|
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
|
||||||
|
|
|
@ -206,8 +206,8 @@ target_vendor = @target_vendor@
|
||||||
# FIXME: consider removing this as soon as we reasonably can.
|
# FIXME: consider removing this as soon as we reasonably can.
|
||||||
|
|
||||||
# Expected defines not covered by zfs_config.h or spl_config.h
|
# Expected defines not covered by zfs_config.h or spl_config.h
|
||||||
AM_FLAGS = -ggdb -O2 -std=c99 -Wall -Wstrict-prototypes -Wshadow \
|
AM_CFLAGS = -ggdb -O2 -std=c99 -Wall -Wstrict-prototypes -Wshadow \
|
||||||
-Wno-switch -Wno-unused -Wno-missing-braces \
|
-Werror -Wno-switch -Wno-unused -Wno-missing-braces \
|
||||||
-Wno-unknown-pragmas -Wno-parentheses -Wno-uninitialized \
|
-Wno-unknown-pragmas -Wno-parentheses -Wno-uninitialized \
|
||||||
-fno-strict-aliasing -D_GNU_SOURCE -D__EXTENSIONS__ \
|
-fno-strict-aliasing -D_GNU_SOURCE -D__EXTENSIONS__ \
|
||||||
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
|
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
|
||||||
|
|
|
@ -211,8 +211,8 @@ target_vendor = @target_vendor@
|
||||||
# FIXME: consider removing this as soon as we reasonably can.
|
# FIXME: consider removing this as soon as we reasonably can.
|
||||||
|
|
||||||
# Expected defines not covered by zfs_config.h or spl_config.h
|
# Expected defines not covered by zfs_config.h or spl_config.h
|
||||||
AM_FLAGS = -ggdb -O2 -std=c99 -Wall -Wstrict-prototypes -Wshadow \
|
AM_CFLAGS = -ggdb -O2 -std=c99 -Wall -Wstrict-prototypes -Wshadow \
|
||||||
-Wno-switch -Wno-unused -Wno-missing-braces \
|
-Werror -Wno-switch -Wno-unused -Wno-missing-braces \
|
||||||
-Wno-unknown-pragmas -Wno-parentheses -Wno-uninitialized \
|
-Wno-unknown-pragmas -Wno-parentheses -Wno-uninitialized \
|
||||||
-fno-strict-aliasing -D_GNU_SOURCE -D__EXTENSIONS__ \
|
-fno-strict-aliasing -D_GNU_SOURCE -D__EXTENSIONS__ \
|
||||||
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
|
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
|
||||||
|
|
|
@ -211,8 +211,8 @@ target_vendor = @target_vendor@
|
||||||
# FIXME: consider removing this as soon as we reasonably can.
|
# FIXME: consider removing this as soon as we reasonably can.
|
||||||
|
|
||||||
# Expected defines not covered by zfs_config.h or spl_config.h
|
# Expected defines not covered by zfs_config.h or spl_config.h
|
||||||
AM_FLAGS = -ggdb -O2 -std=c99 -Wall -Wstrict-prototypes -Wshadow \
|
AM_CFLAGS = -ggdb -O2 -std=c99 -Wall -Wstrict-prototypes -Wshadow \
|
||||||
-Wno-switch -Wno-unused -Wno-missing-braces \
|
-Werror -Wno-switch -Wno-unused -Wno-missing-braces \
|
||||||
-Wno-unknown-pragmas -Wno-parentheses -Wno-uninitialized \
|
-Wno-unknown-pragmas -Wno-parentheses -Wno-uninitialized \
|
||||||
-fno-strict-aliasing -D_GNU_SOURCE -D__EXTENSIONS__ \
|
-fno-strict-aliasing -D_GNU_SOURCE -D__EXTENSIONS__ \
|
||||||
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
|
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
|
||||||
|
|
|
@ -212,8 +212,8 @@ target_vendor = @target_vendor@
|
||||||
# FIXME: consider removing this as soon as we reasonably can.
|
# FIXME: consider removing this as soon as we reasonably can.
|
||||||
|
|
||||||
# Expected defines not covered by zfs_config.h or spl_config.h
|
# Expected defines not covered by zfs_config.h or spl_config.h
|
||||||
AM_FLAGS = -ggdb -O2 -std=c99 -Wall -Wstrict-prototypes -Wshadow \
|
AM_CFLAGS = -ggdb -O2 -std=c99 -Wall -Wstrict-prototypes -Wshadow \
|
||||||
-Wno-switch -Wno-unused -Wno-missing-braces \
|
-Werror -Wno-switch -Wno-unused -Wno-missing-braces \
|
||||||
-Wno-unknown-pragmas -Wno-parentheses -Wno-uninitialized \
|
-Wno-unknown-pragmas -Wno-parentheses -Wno-uninitialized \
|
||||||
-fno-strict-aliasing -D_GNU_SOURCE -D__EXTENSIONS__ \
|
-fno-strict-aliasing -D_GNU_SOURCE -D__EXTENSIONS__ \
|
||||||
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
|
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
|
||||||
|
|
|
@ -207,8 +207,8 @@ target_vendor = @target_vendor@
|
||||||
# FIXME: consider removing this as soon as we reasonably can.
|
# FIXME: consider removing this as soon as we reasonably can.
|
||||||
|
|
||||||
# Expected defines not covered by zfs_config.h or spl_config.h
|
# Expected defines not covered by zfs_config.h or spl_config.h
|
||||||
AM_FLAGS = -ggdb -O2 -std=c99 -Wall -Wstrict-prototypes -Wshadow \
|
AM_CFLAGS = -ggdb -O2 -std=c99 -Wall -Wstrict-prototypes -Wshadow \
|
||||||
-Wno-switch -Wno-unused -Wno-missing-braces \
|
-Werror -Wno-switch -Wno-unused -Wno-missing-braces \
|
||||||
-Wno-unknown-pragmas -Wno-parentheses -Wno-uninitialized \
|
-Wno-unknown-pragmas -Wno-parentheses -Wno-uninitialized \
|
||||||
-fno-strict-aliasing -D_GNU_SOURCE -D__EXTENSIONS__ \
|
-fno-strict-aliasing -D_GNU_SOURCE -D__EXTENSIONS__ \
|
||||||
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
|
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
|
||||||
|
|
|
@ -212,8 +212,8 @@ target_vendor = @target_vendor@
|
||||||
# FIXME: consider removing this as soon as we reasonably can.
|
# FIXME: consider removing this as soon as we reasonably can.
|
||||||
|
|
||||||
# Expected defines not covered by zfs_config.h or spl_config.h
|
# Expected defines not covered by zfs_config.h or spl_config.h
|
||||||
AM_FLAGS = -ggdb -O2 -std=c99 -Wall -Wstrict-prototypes -Wshadow \
|
AM_CFLAGS = -ggdb -O2 -std=c99 -Wall -Wstrict-prototypes -Wshadow \
|
||||||
-Wno-switch -Wno-unused -Wno-missing-braces \
|
-Werror -Wno-switch -Wno-unused -Wno-missing-braces \
|
||||||
-Wno-unknown-pragmas -Wno-parentheses -Wno-uninitialized \
|
-Wno-unknown-pragmas -Wno-parentheses -Wno-uninitialized \
|
||||||
-fno-strict-aliasing -D_GNU_SOURCE -D__EXTENSIONS__ \
|
-fno-strict-aliasing -D_GNU_SOURCE -D__EXTENSIONS__ \
|
||||||
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
|
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
|
||||||
|
@ -221,6 +221,7 @@ AM_FLAGS = -ggdb -O2 -std=c99 -Wall -Wstrict-prototypes -Wshadow \
|
||||||
-DTEXT_DOMAIN=\\\"zfs-linux-user\\\"
|
-DTEXT_DOMAIN=\\\"zfs-linux-user\\\"
|
||||||
DEFAULT_INCLUDES = \
|
DEFAULT_INCLUDES = \
|
||||||
-I${top_srcdir}/module/zcommon/include \
|
-I${top_srcdir}/module/zcommon/include \
|
||||||
|
-I${top_srcdir}/module/nvpair/include \
|
||||||
-I${top_srcdir}/lib/libspl/include
|
-I${top_srcdir}/lib/libspl/include
|
||||||
|
|
||||||
lib_LTLIBRARIES = libzcommon.la
|
lib_LTLIBRARIES = libzcommon.la
|
||||||
|
|
|
@ -214,8 +214,8 @@ target_vendor = @target_vendor@
|
||||||
# FIXME: consider removing this as soon as we reasonably can.
|
# FIXME: consider removing this as soon as we reasonably can.
|
||||||
|
|
||||||
# Expected defines not covered by zfs_config.h or spl_config.h
|
# Expected defines not covered by zfs_config.h or spl_config.h
|
||||||
AM_FLAGS = -ggdb -O2 -std=c99 -Wall -Wstrict-prototypes -Wshadow \
|
AM_CFLAGS = -ggdb -O2 -std=c99 -Wall -Wstrict-prototypes -Wshadow \
|
||||||
-Wno-switch -Wno-unused -Wno-missing-braces \
|
-Werror -Wno-switch -Wno-unused -Wno-missing-braces \
|
||||||
-Wno-unknown-pragmas -Wno-parentheses -Wno-uninitialized \
|
-Wno-unknown-pragmas -Wno-parentheses -Wno-uninitialized \
|
||||||
-fno-strict-aliasing -D_GNU_SOURCE -D__EXTENSIONS__ \
|
-fno-strict-aliasing -D_GNU_SOURCE -D__EXTENSIONS__ \
|
||||||
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
|
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
|
||||||
|
|
|
@ -211,8 +211,8 @@ target_vendor = @target_vendor@
|
||||||
# FIXME: consider removing this as soon as we reasonably can.
|
# FIXME: consider removing this as soon as we reasonably can.
|
||||||
|
|
||||||
# Expected defines not covered by zfs_config.h or spl_config.h
|
# Expected defines not covered by zfs_config.h or spl_config.h
|
||||||
AM_FLAGS = -ggdb -O2 -std=c99 -Wall -Wstrict-prototypes -Wshadow \
|
AM_CFLAGS = -ggdb -O2 -std=c99 -Wall -Wstrict-prototypes -Wshadow \
|
||||||
-Wno-switch -Wno-unused -Wno-missing-braces \
|
-Werror -Wno-switch -Wno-unused -Wno-missing-braces \
|
||||||
-Wno-unknown-pragmas -Wno-parentheses -Wno-uninitialized \
|
-Wno-unknown-pragmas -Wno-parentheses -Wno-uninitialized \
|
||||||
-fno-strict-aliasing -D_GNU_SOURCE -D__EXTENSIONS__ \
|
-fno-strict-aliasing -D_GNU_SOURCE -D__EXTENSIONS__ \
|
||||||
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
|
-D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
|
||||||
|
|
Loading…
Reference in New Issue