Commit Graph

2742 Commits

Author SHA1 Message Date
Brian Behlendorf a8adb61c00 Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch 2009-10-14 15:57:08 -07:00
Brian Behlendorf 09a8c99097 Additional build system update for libefi library.
This include updating all the Makefile.am to have the correct
include paths and libraries.  In addition, the zlib m4 macro was
updated to more correctly integrate with the Makefiles.  And I
added two new macros libblkid and libuuid which will be needed by
subsequent commits for blkid and uuid support respectively.  The
blkid support is optional, the uuid support is mandatory for libefi.
2009-10-14 15:47:41 -07:00
Brian Behlendorf 39d85a8b94 Remove pragmas from new libefi files. 2009-10-14 15:44:22 -07:00
Brian Behlendorf 10cb050e20 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-10-09 16:43:37 -07:00
Brian Behlendorf cb91bbe6ce Additional set of build system tweaks for libefi library. 2009-10-09 16:37:32 -07:00
Brian Behlendorf 2001a56428 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-10-09 16:09:38 -07:00
Brian Behlendorf a0337cfcd8 Add libefi library in to the build system. 2009-10-09 15:58:45 -07:00
Brian Behlendorf 9a76c49ee6 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-10-09 15:45:06 -07:00
Brian Behlendorf e0e0f0ea84 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-10-09 15:43:33 -07:00
Brian Behlendorf 2b2fd27e18 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2009-10-09 15:43:32 -07:00
Brian Behlendorf ad0f8481d2 Merge commit 'refs/top-bases/feature-branch' into feature-branch 2009-10-09 15:43:31 -07:00
Brian Behlendorf b60766e22f Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2009-10-09 15:43:31 -07:00
Brian Behlendorf 7698515ec4 Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads 2009-10-09 15:43:30 -07:00
Brian Behlendorf 6df047f11f Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2009-10-09 15:43:30 -07:00
Brian Behlendorf 656d8f6b22 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2009-10-09 15:43:28 -07:00
Brian Behlendorf 46fa16ed8c Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2009-10-09 15:43:28 -07:00
Brian Behlendorf 46b272f2c4 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-10-09 15:43:25 -07:00
Brian Behlendorf 1b7a8f5e26 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2009-10-09 15:43:24 -07:00
Brian Behlendorf 873470861e Merge commit 'refs/top-bases/fix-acl' into fix-acl 2009-10-09 15:43:23 -07:00
Brian Behlendorf a4c68aa767 Merge branch 'fix-acl' into refs/top-bases/fix-branch 2009-10-09 15:43:23 -07:00
Brian Behlendorf 27c7573a5e Merge branch 'fix-deadcode' into refs/top-bases/fix-branch 2009-10-09 15:43:22 -07:00
Brian Behlendorf 6d3da13a7d Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode 2009-10-09 15:43:21 -07:00
Brian Behlendorf 69d396e7e0 Merge commit 'refs/top-bases/fix-strncat' into fix-strncat 2009-10-09 15:43:20 -07:00
Brian Behlendorf 00699175eb Merge branch 'fix-strncat' into refs/top-bases/fix-branch 2009-10-09 15:43:20 -07:00
Brian Behlendorf 38a311ac31 Merge commit 'refs/top-bases/fix-list' into fix-list 2009-10-09 15:43:18 -07:00
Brian Behlendorf 3b18b22fb3 Merge branch 'fix-list' into refs/top-bases/fix-branch 2009-10-09 15:43:18 -07:00
Brian Behlendorf ed89c3baec Merge branch 'fix-taskq' into refs/top-bases/fix-branch 2009-10-09 15:43:17 -07:00
Brian Behlendorf d7d86be950 Merge commit 'refs/top-bases/fix-taskq' into fix-taskq 2009-10-09 15:43:16 -07:00
Brian Behlendorf e59c225cea Merge commit 'refs/top-bases/fix-stack' into fix-stack 2009-10-09 15:43:15 -07:00
Brian Behlendorf dbdf553198 Merge branch 'fix-stack' into refs/top-bases/fix-branch 2009-10-09 15:43:15 -07:00
Brian Behlendorf 49529232e1 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2009-10-09 15:43:13 -07:00
Brian Behlendorf 3d7d195f48 Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch 2009-10-09 15:43:13 -07:00
Brian Behlendorf 1719b6ee81 Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch 2009-10-09 15:43:12 -07:00
Brian Behlendorf dd666623a4 Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod 2009-10-09 15:43:11 -07:00
Brian Behlendorf fb2c44bdfc Merge commit 'refs/top-bases/fix-newlines' into fix-newlines 2009-10-09 15:43:10 -07:00
Brian Behlendorf 1d88115083 Merge branch 'fix-newlines' into refs/top-bases/fix-branch 2009-10-09 15:43:10 -07:00
Brian Behlendorf 1af5dcae21 Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs 2009-10-09 15:43:08 -07:00
Brian Behlendorf 8dc9c727ad Merge branch 'fix-get-configs' into refs/top-bases/fix-branch 2009-10-09 15:43:08 -07:00
Brian Behlendorf a8c1c53084 Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch 2009-10-09 15:43:07 -07:00
Brian Behlendorf 7cfd9ab530 Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs 2009-10-09 15:43:06 -07:00
Brian Behlendorf 1004439a17 Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t 2009-10-09 15:43:05 -07:00
Brian Behlendorf b66f239d85 Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch 2009-10-09 15:43:05 -07:00
Brian Behlendorf 08328c349b Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons 2009-10-09 15:43:03 -07:00
Brian Behlendorf f2d727b7d9 Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch 2009-10-09 15:43:03 -07:00
Brian Behlendorf aed78880bc Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch 2009-10-09 15:43:02 -07:00
Brian Behlendorf e3ad5a40f6 Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t 2009-10-09 15:43:01 -07:00
Brian Behlendorf 5fc177d934 Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2009-10-09 15:43:00 -07:00
Brian Behlendorf b882332ed3 Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2009-10-09 15:42:59 -07:00
Brian Behlendorf 9302f90662 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-10-09 15:42:56 -07:00
Brian Behlendorf 410802e85a Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-10-09 15:42:55 -07:00