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
68cf0243af
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-04-22 10:01:03 -07:00
d69cfcab40
Add top level SPL include path which is needed for *-devel builds
2010-04-22 09:55:07 -07:00
e2fd5968c0
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-03-26 15:48:24 -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
039764638e
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-03-22 16:56:39 -07:00
5b14d2ab2f
Move zfs_config.h include to command line -include
...
Remove the few places in the code where zfs_config.h is included.
It is now added to the gcc compile line to ensure the config results
2010-03-22 16:50:58 -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
c5bfc2688e
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-03-11 16:29:19 -08:00
6157362ad3
Prep for 0.4.8 tag, updated META and ChangeLog
2010-03-11 16:25:03 -08:00
de35ba6f9d
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-03-11 14:09:18 -08:00
feee765f99
Remove promise example config replace with a supermicro config
...
The promise config never worked quite right. I'm replacing it with
a Supermicro config which does and which I've tested on a real test
system.
2010-03-11 14:04:12 -08:00
e7b3766a69
Remove udev dependency when running in-tree
...
After much contemplation I can't see a clean way to use udev entirely
in-tree for testing. This patch removed a horrible horrible hack which
would copy the needed udev bits in to place on your system to make it
work. That however is simply not acceptable, nothing you in in-tree
should ever ever ever install something on your system.
Since I could not come up with a clean way to use udev in-tree. The
fix is to simply parse the zdev config file and create the needed
symlinks in a sub-diretory or your working tree. This is not as clean
as using udev but it does work perfectly well for in-tree testing.
2010-03-11 13:56:20 -08:00
bdfdfcc069
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-03-11 10:01:03 -08:00
fddf5c888f
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-03-11 09:55:44 -08:00
ce1160b5b9
Merge branch 'feature-branch' into refs/top-bases/zfs-branch
2010-03-11 09:55:43 -08:00
5e4f96bb2f
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2010-03-11 09:55:42 -08:00
2269c6aef0
Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads
2010-03-11 09:55:41 -08:00
5302158673
Merge branch 'feature-pthreads' into refs/top-bases/feature-branch
2010-03-11 09:55:41 -08:00
7d196935b2
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2010-03-11 09:55:40 -08:00
389bb5a604
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2010-03-11 09:55:39 -08:00
a20a614a87
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2010-03-11 09:55:38 -08:00
db0227bc9e
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-03-11 09:55:36 -08:00
59d56028e7
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-03-11 09:55:35 -08:00
05926244c0
Merge commit 'refs/top-bases/fix-error-handling' into fix-error-handling
2010-03-11 09:55:34 -08:00
858e56fbb4
Merge branch 'fix-error-handling' into refs/top-bases/fix-branch
2010-03-11 09:55:34 -08:00
c997dd4d16
Merge branch 'fix-acl' into refs/top-bases/fix-branch
2010-03-11 09:55:33 -08:00
48bf985a0e
Merge commit 'refs/top-bases/fix-acl' into fix-acl
2010-03-11 09:55:32 -08:00
b7391af874
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
2010-03-11 09:55:31 -08:00
8fc5cb913d
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2010-03-11 09:55:31 -08:00
05954100ab
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
2010-03-11 09:55:30 -08:00
1e885d5c84
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
2010-03-11 09:55:29 -08:00
bd6129fa56
Merge commit 'refs/top-bases/fix-list' into fix-list
2010-03-11 09:55:28 -08:00
3ea7323532
Merge branch 'fix-list' into refs/top-bases/fix-branch
2010-03-11 09:55:28 -08:00
ddb181cb53
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2010-03-11 09:55:27 -08:00
8a80550731
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2010-03-11 09:55:26 -08:00
48b18e3fee
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2010-03-11 09:55:25 -08:00
ec0163c7ff
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2010-03-11 09:55:25 -08:00
fbc1435214
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
2010-03-11 09:55:24 -08:00
d8fb08731e
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2010-03-11 09:55:23 -08:00
Brian Behlendorf