b435769a81
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
2010-04-29 10:41:35 -07:00
6aeb39cbba
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
2010-04-29 10:41:34 -07:00
8b60ca1d4a
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
2010-04-29 10:41:33 -07:00
3a6c1b1ba7
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
2010-04-29 10:41:33 -07:00
71d3e4ca66
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2010-04-29 10:41:31 -07:00
2aaac8dc57
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
2010-04-29 10:41:31 -07:00
1b75fa2fb3
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
2010-04-29 10:41:30 -07:00
6fb918dbb2
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
2010-04-29 10:41:29 -07:00
dbda9cb8fc
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2010-04-29 10:41:28 -07:00
d03db3ec68
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
2010-04-29 10:41:28 -07:00
aeea026fe9
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2010-04-29 10:41:27 -07:00
5bd5bf096a
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2010-04-29 10:41:26 -07:00
a94b5a1f11
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
2010-04-29 10:41:25 -07:00
86049947d8
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2010-04-29 10:41:24 -07:00
13668b7879
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2010-04-29 10:41:23 -07:00
f2ca1d7334
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2010-04-29 10:41:22 -07:00
34d62da9bc
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2010-04-29 10:41:18 -07:00
d6ba7a916f
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2010-04-29 10:41:17 -07:00
e30645fedc
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
2010-04-29 10:41:17 -07:00
70c7b7a5dd
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
2010-04-29 10:41:16 -07:00
6bd9ded2aa
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2010-04-29 10:41:13 -07:00
986366989f
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
2010-04-29 10:41:12 -07:00
e02cd45d13
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2010-04-29 10:41:10 -07:00
d91c81c4df
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2010-04-29 10:41:09 -07:00
481d967b31
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2010-04-29 10:41:06 -07:00
4408195868
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
2010-04-29 10:41:05 -07:00
3cfe96925e
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2010-04-29 10:41:03 -07:00
a3c2fb2333
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2010-04-29 10:41:02 -07:00
61e6759e44
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2010-04-29 10:41:01 -07:00
3bd5ecf4a7
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2010-04-29 10:41:00 -07:00
89855b6d11
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2010-04-29 10:40:58 -07:00
530d9b5702
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2010-04-29 10:40:57 -07:00
aace977d6e
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2010-04-29 10:40:55 -07:00
c3da525f25
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2010-04-29 10:40:54 -07:00
701704178c
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2010-04-29 10:40:52 -07:00
1655c9c76f
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2010-04-29 10:40:51 -07:00
9151a0566a
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2010-04-29 10:40:49 -07:00
097e1158e6
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2010-04-29 10:40:48 -07:00
60c7fd584d
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
2010-04-29 10:40:46 -07:00
e124150522
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2010-04-29 10:40:45 -07:00
f51b32b5ef
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
2010-04-29 10:40:43 -07:00
9864c23b4a
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2010-04-29 10:40:41 -07:00
b9dd820df8
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2010-04-29 10:40:39 -07:00
d5dbdb4fe2
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2010-04-29 10:40:38 -07:00
8c24800b72
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2010-04-29 10:40:36 -07:00
4aad8d3244
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2010-04-29 10:40:34 -07:00
fa42225a3d
Add Solaris FMA style support
2010-04-29 10:37:15 -07:00
d69cfcab40
Add top level SPL include path which is needed for *-devel builds
2010-04-22 09:55:07 -07:00
23ab272555
Add support for 'make -s' silent builds
...
The cleanest way to do this is to set AM_LIBTOOLFLAGS = --silent. However,
AM_LIBTOOLFLAGS is not honored by automake-1.9.6-2.1 which is what I have
been using. To cleanly handle this I am updating to automake-1.11-3 which
is why it looks like there is a lot of churn in the Makefiles.
2010-03-26 15:41:41 -07:00
e96be1888a
Allow zfs_config.h to be included by dependant packages (updated)
...
We need dependent packages to be able to include zfs_config.h to
build properly. This was partially solved previously be using
AH_BOTTOM to #undef common #defines (PACKAGE, VERSION, etc) which
autoconf always adds and cannot be easily removed. This solution
works as long as the zfs_config.h is included before your projects
config.h. That turns out to be easier said than done. In particular,
this is a problem when your package includes its config.h using the
-include gcc option which ensures the first thing included is your
config.h.
To handle all cases cleanly I have removed the AH_BOTTOM hack and
replaced it with an AC_CONFIG_HEADERS command. This command runs
immediately after zfs_config.h is written and with a little awk-foo
it strips the offending #defines from the file. This eliminates
the problem entirely and makes header safe for inclusion.
2010-03-22 16:42:18 -07:00
Brian Behlendorf