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

Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk

This commit is contained in:
Brian Behlendorf 2009-03-11 13:27:09 -07:00
parent 03ffadb74b 4e945fb768
commit 46a021cc8b
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/Rules.am
View File

@ -5,9 +5,8 @@ DEFAULT_INCLUDES = -I${top_srcdir}
# #
# FIXME: Add -Wshadow once everything is working # FIXME: Add -Wshadow once everything is working
# #
AM_CFLAGS = -Wall -Wstrict-prototypes -Werror AM_CFLAGS = -Wall -Wstrict-prototypes -Werror -Wno-parentheses
AM_CFLAGS += -Wno-switch -Wno-unused -Wno-missing-braces AM_CFLAGS += -Wno-switch -Wno-unused -Wno-missing-braces
AM_CFLAGS += -Wno-unknown-pragmas -Wno-parentheses
AM_CFLAGS += -Wno-uninitialized -fno-strict-aliasing AM_CFLAGS += -Wno-uninitialized -fno-strict-aliasing
# Expected defines not covered by zfs_config.h or spl_config.h # Expected defines not covered by zfs_config.h or spl_config.h

8
config/kernel.m4
View File

@ -8,10 +8,10 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
# FIXME: Quiet warnings not covered by the gcc-* patches. We should # FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can # FIXME: consider removing this as soon as we reasonably can
KERNELCPPFLAGS="$KERNELCPPFLAGS -Wall -Wstrict-prototypes -Werror " KERNELCPPFLAGS="$KERNELCPPFLAGS -Wall -Wstrict-prototypes -Werror"
KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-switch -Wno-unused -Wno-missing-braces " KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-switch -Wno-unused"
KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-unknown-pragmas -Wno-parentheses " KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-missing-braces -Wno-parentheses"
KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-uninitialized -fno-strict-aliasing " KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-uninitialized -fno-strict-aliasing"
KERNELCPPFLAGS="$KERNELCPPFLAGS -DHAVE_SPL -D_KERNEL " KERNELCPPFLAGS="$KERNELCPPFLAGS -DHAVE_SPL -D_KERNEL "
KERNELCPPFLAGS="$KERNELCPPFLAGS -DTEXT_DOMAIN=\\\"zfs-linux-kernel\\\" " KERNELCPPFLAGS="$KERNELCPPFLAGS -DTEXT_DOMAIN=\\\"zfs-linux-kernel\\\" "

3
module/Makefile.in
View File

@ -10,7 +10,8 @@ modules clean:
$(MAKE) -C @LINUX@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ $@ $(MAKE) -C @LINUX@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ $@
modules_install: modules_install:
$(MAKE) -C @LINUX@ SUBDIRS=`pwd` INSTALL_MOD_PATH=$(DESTDIR) INSTALL_MOD_DIR=addon $@ $(MAKE) -C @LINUX@ SUBDIRS=`pwd` \
INSTALL_MOD_PATH=$(DESTDIR) INSTALL_MOD_DIR=addon $@
# Install the required headers in to the kernel source # Install the required headers in to the kernel source
(mkdir -p $(DESTDIR)/@LINUX@/include/zfs && \ (mkdir -p $(DESTDIR)/@LINUX@/include/zfs && \
find . -mindepth 3 -maxdepth 3 -name '*.h' | \ find . -mindepth 3 -maxdepth 3 -name '*.h' | \