diff options
| author | Prakash Surya <[email protected]> | 2012-08-07 17:07:55 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2012-08-08 15:20:55 -0700 |
| commit | 5085d55817f67e2333366e517c6cc7a6fdda50f7 (patch) | |
| tree | 35c711bac298253db373ccb47f7eb712c8128ef0 /config/kernel.m4 | |
| parent | d96eb2b1538db13ee7a716ec0e1162f5735edc12 (diff) | |
Add '--with-spl-timeout' option
When checking for the SPL Module.symvers file, a timeout can now be
passed in which will pause the configure step while it waits for this
file to be generated. By default, the configure behavior is unchanged as
a timeout of 0 is used. If a positive number of seconds is passed,
configure will wait that number of seconds for the Module.symvers file
before moving on.
The main motivation for this change was to support parallel execution of
'./configure && make' for the SPL and ZFS packages in preparation of
supporting DKMS based packages.
Signed-off-by: Prakash Surya <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'config/kernel.m4')
| -rw-r--r-- | config/kernel.m4 | 51 |
1 files changed, 36 insertions, 15 deletions
diff --git a/config/kernel.m4 b/config/kernel.m4 index 260ad84f4..7d8a5f4d5 100644 --- a/config/kernel.m4 +++ b/config/kernel.m4 @@ -218,24 +218,45 @@ AC_DEFUN([ZFS_AC_KERNEL], [ dnl # dnl # Detect name used for the additional SPL Module.symvers file. If one dnl # does not exist this is likely because the SPL has been configured -dnl # but not built. To allow recursive builds a good guess is made as to -dnl # what this file will be named based on what it is named in the kernel -dnl # build products. This file will first be used at link time so if -dnl # the guess is wrong the build will fail then. This unfortunately -dnl # means the ZFS package does not contain a reliable mechanism to -dnl # detect symbols exported by the SPL at configure time. +dnl # but not built. The '--with-spl-timeout' option can be passed +dnl # to pause here, waiting for the file to appear from a concurrently +dnl # building SPL package. If the file does not appear in time, a good +dnl # guess is made as to what this file will be named based on what it +dnl # is named in the kernel build products. This file will first be +dnl # used at link time so if the guess is wrong the build will fail +dnl # then. This unfortunately means the ZFS package does not contain a +dnl # reliable mechanism to detect symbols exported by the SPL at +dnl # configure time. dnl # AC_DEFUN([ZFS_AC_SPL_MODULE_SYMVERS], [ + AC_ARG_WITH([spl-timeout], + AS_HELP_STRING([--with-spl-timeout=SECS], + [Wait SECS for symvers file to appear @<:@default=0@:>@]), + [timeout="$withval"], [timeout=0]) + AC_MSG_CHECKING([spl file name for module symbols]) - AS_IF([test -r $SPL_OBJ/Module.symvers], [ - SPL_SYMBOLS=Module.symvers - ], [test -r $SPL_OBJ/Modules.symvers], [ - SPL_SYMBOLS=Modules.symvers - ], [test -r $SPL_OBJ/module/Module.symvers], [ - SPL_SYMBOLS=Module.symvers - ], [test -r $SPL_OBJ/module/Modules.symvers], [ - SPL_SYMBOLS=Modules.symvers - ], [ + SPL_SYMBOLS=NONE + + while true; do + AS_IF([test -r $SPL_OBJ/Module.symvers], [ + SPL_SYMBOLS=Module.symvers + ], [test -r $SPL_OBJ/Modules.symvers], [ + SPL_SYMBOLS=Modules.symvers + ], [test -r $SPL_OBJ/module/Module.symvers], [ + SPL_SYMBOLS=Module.symvers + ], [test -r $SPL_OBJ/module/Modules.symvers], [ + SPL_SYMBOLS=Modules.symvers + ]) + + AS_IF([test $SPL_SYMBOLS != NONE -o $timeout -le 0], [ + break; + ], [ + sleep 1 + timeout=$((timeout-1)) + ]) + done + + AS_IF([test "$SPL_SYMBOLS" = NONE], [ SPL_SYMBOLS=$LINUX_SYMBOLS ]) |