X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=config%2Flustre-build.m4;h=d2db8237e75f73c7bf33a9208dff214085e7b675;hp=32b3861c41007196d943d406e5143246b36c69f7;hb=0c8d53e17be600c99e4a8f96062f39306c3ccad8;hpb=01def2b635ff0b7bacde158d9124334c42cd5d2b diff --git a/config/lustre-build.m4 b/config/lustre-build.m4 index 32b3861..d2db823 100644 --- a/config/lustre-build.m4 +++ b/config/lustre-build.m4 @@ -1,14 +1,4 @@ # -# LB_CHECK_VERSION -# -# Verify that LUSTRE_VERSION was defined properly -# -AC_DEFUN([LB_CHECK_VERSION], [ -AS_IF([test "LUSTRE_VERSION" = "LUSTRE""_VERSION"], - [AC_MSG_ERROR([This script was not built with a version number.])]) -]) # LB_CHECK_VERSION - -# # LB_CANONICAL_SYSTEM # # fixup $target_os for use in other places @@ -23,89 +13,17 @@ AC_SUBST(lb_target_os) ]) # LB_CANONICAL_SYSTEM # -# LB_DOWNSTREAM_RELEASE +# LB_DOWNSTREAM_RELEASE (DEPRECATED) # AC_DEFUN([LB_DOWNSTREAM_RELEASE], -[AC_ARG_WITH([downstream-release], - AC_HELP_STRING([--with-downstream-release=string], - [set a string in the BUILD_VERSION and RPM Release: (default is nothing)]), - [DOWNSTREAM_RELEASE=$with_downstream_release], - [ # if not specified, see if it's in the META file - AS_IF([test -f META], - [DOWNSTREAM_RELEASE=$(sed -ne '/^LOCAL_VERSION =/s/.*= *//p' META)]) - ]) -AC_SUBST(DOWNSTREAM_RELEASE) -]) # LB_DOWNSTREAM_RELEASE - -# -# LB_BUILDID -# -# Check if the source is a GA release and if not, set a "BUILDID" -# -# Currently there are at least two ways/modes of/for doing this. One -# is if we are in a valid git repository, the other is if we are in a -# non-git source tree of some form. Building the latter from the former -# will be handled here. -AC_DEFUN([LB_BUILDID], [ -AC_CACHE_CHECK([for buildid], [lb_cv_buildid], [ -lb_cv_buildid="" -AS_IF([git branch >/dev/null 2>&1], [ - ffw=0 - hash="" - ver=$(git describe --match v[[0-9]]_*_[[0-9]]* --tags) - if [[[ $ver = *-*-* ]]]; then - hash=${ver##*-} - ffw=${ver#*-} - ffw=${ffw%-*} - ver=${ver%%-*} - fi - # it's tempting to use [[ $ver =~ ^v([0-9]+_)+([0-9]+|RC[0-9]+)$ ]] - # here but the portability of the regex on the right is dismal - # (thanx suse) - if echo "$ver" | egrep -q "^v([[0-9]]+_)+([[0-9]]+|RC[[0-9]]+)$"; then - ver=$(echo $ver | sed -e 's/^v\(.*\)/\1/' \ - -e 's/_RC[[0-9]].*$//' -e 's/_/./g') - fi - - # a "lustre fix" value of .0 should be truncated - if [[[ $ver = *.*.*.0 ]]]; then - ver=${ver%.0} - fi - # ditto for a "lustre fix" value of _0 - if [[[ $ver = v*_*_*_0 ]]]; then - ver=${ver%_0} - fi - if [[[ $ver = v*_*_* ]]]; then - ver=${ver#v} - ver=${ver//_/.} - fi - - if test "$ver" != "$VERSION"; then - AC_MSG_WARN([most recent tag found: $ver does not match current version $VERSION.]) - fi - - if test "$ffw" != "0"; then - lb_cv_buildid="$hash" - fi -], [test -f META], [ - lb_cv_buildid=$(sed -ne '/^BUILDID =/s/.*= *//p' META) -]) -]) -AS_IF([test -z "$lb_cv_buildid"], [ - AC_MSG_WARN([ - -FIXME: I don't know how to deal with source trees outside of git that -don't have a META file. Not setting a buildid. -]) -]) -BUILDID=$lb_cv_buildid -AC_SUBST(BUILDID) -]) # LB_BUILDID +[AC_ARG_WITH([downstream-release],, + AC_MSG_ERROR([--downstream-release was deprecated. Please read Documentation/versioning.txt.]) +)]) # LB_DOWNSTREAM_RELEASE # # LB_CHECK_FILE # -# Check for file existance even when cross compiling +# Check for file existence even when cross compiling # $1 - file to check # $2 - do 'yes' # $3 - do 'no' @@ -199,6 +117,30 @@ AC_SUBST(LIBCFS_SUBDIR) ]) # LB_LIBCFS_DIR # +# LB_LIBMOUNT +# +# Check whether build with libmount for mount.lustre. +# libmount is part of the util-linux since v2.18. +# We need it to manipulate utab file. +# +AC_DEFUN([LB_LIBMOUNT], [ +AC_CHECK_HEADER([libmount/libmount.h], [ + AC_CHECK_LIB([mount], [mnt_update_set_fs], [ + LDLIBMOUNT="-lmount" + AC_SUBST(LDLIBMOUNT) + AC_DEFINE(HAVE_LIBMOUNT, 1, [build with libmount]) + with_libmount="yes" + ],[with_libmount="no"]) +], [with_libmount="no"]) +AC_MSG_CHECKING([whether to build with libmount]) +AS_IF([test "x$with_libmount" = xyes], [ + AC_MSG_RESULT([yes]) +], [ + AC_MSG_RESULT([no]) +]) +]) # LB_LIBMOUNT + +# # LB_PATH_SNMP # # check for in-tree snmp support @@ -252,7 +194,6 @@ AC_ARG_ENABLE([utils], [disable building of Lustre utility programs]), [], [enable_utils="yes"]) AC_MSG_RESULT([$enable_utils]) -AS_IF([test "x$enable_utils" = xyes], [LB_CONFIG_INIT_SCRIPTS]) ]) # LB_CONFIG_UTILS # @@ -310,24 +251,18 @@ AC_SUBST(ENABLE_DOC) ]) # LB_CONFIG_DOCS # -# LB_CONFIG_INIT_SCRIPTS +# LB_CONFIG_MANPAGES # -# our init scripts only work on red hat linux +# Build manpages? # -AC_DEFUN([LB_CONFIG_INIT_SCRIPTS], [ -ENABLE_INIT_SCRIPTS=0 -AS_IF([test x$enable_utils = xyes], [ - AC_CACHE_CHECK([whether to install init scripts], [lb_cv_enable_init_scripts], [ - # our scripts only work on red hat systems - AS_IF([test -f /etc/init.d/functions -a -f /etc/sysconfig/network], - [lb_cv_enable_init_scripts="yes"], - [lb_cv_enable_init_scripts="no"]) - ]) - AS_IF([test "x$lb_cv_enable_init_scripts" = xyes], - [ENABLE_INIT_SCRIPTS=1]) -]) -AC_SUBST(ENABLE_INIT_SCRIPTS) -]) +AC_DEFUN([LB_CONFIG_MANPAGES], [ +AC_MSG_CHECKING([whether to build Lustre manpages]) +AC_ARG_ENABLE([manpages], + AC_HELP_STRING([--disable-manpages], + [skip creation and inclusion of man pages (default is enable)]), + [], [enable_manpages="yes"]) +AC_MSG_RESULT([$enable_manpages]) +]) # LB_CONFIG_MANPAGES # # LB_CONFIG_HEADERS @@ -336,8 +271,8 @@ AC_SUBST(ENABLE_INIT_SCRIPTS) # AC_DEFUN([LB_CONFIG_HEADERS], [ AC_CONFIG_HEADERS([config.h]) -CPPFLAGS="-include $PWD/config.h $CPPFLAGS" -EXTRA_KCFLAGS="-include $PWD/config.h $EXTRA_KCFLAGS" +CPPFLAGS="-include $PWD/undef.h -include $PWD/config.h $CPPFLAGS" +EXTRA_KCFLAGS="-include $PWD/undef.h -include $PWD/config.h $EXTRA_KCFLAGS" AC_SUBST(EXTRA_KCFLAGS) ]) # LB_CONFIG_HEADERS @@ -360,11 +295,11 @@ AC_DEFUN([LB_PATH_DEFAULTS], [ # directories for binaries AC_PREFIX_DEFAULT([/usr]) -sysconfdir='$(CROSS_PATH)/etc' +sysconfdir='/etc' AC_SUBST(sysconfdir) # Directories for documentation and demos. -docdir='$(datadir)/doc/$(PACKAGE)' +docdir='${datadir}/doc/$(PACKAGE)' AC_SUBST(docdir) LIBCFS_PATH_DEFAULTS @@ -396,13 +331,6 @@ AS_IF([test $target_cpu = powerpc64], [ CPPFLAGS="-I$PWD/$LIBCFS_INCLUDE_DIR -I$PWD/lnet/include -I$PWD/lustre/include $CPPFLAGS" -LLCPPFLAGS="-D__arch_lib__ -D_LARGEFILE64_SOURCE=1" -AC_SUBST(LLCPPFLAGS) - -# Add _GNU_SOURCE for strnlen on linux -LLCFLAGS="-g -Wall -fPIC -D_GNU_SOURCE" -AC_SUBST(LLCFLAGS) - CCASFLAGS="-Wall -fPIC -D_GNU_SOURCE" AC_SUBST(CCASFLAGS) @@ -422,10 +350,12 @@ AM_CONDITIONAL([MODULES], [test x$enable_modules = xyes]) AM_CONDITIONAL([UTILS], [test x$enable_utils = xyes]) AM_CONDITIONAL([TESTS], [test x$enable_tests = xyes]) AM_CONDITIONAL([DOC], [test x$ENABLE_DOC = x1]) -AM_CONDITIONAL([INIT_SCRIPTS], [test x$ENABLE_INIT_SCRIPTS = x1]) +AM_CONDITIONAL([MANPAGES], [test x$enable_manpages = xyes]) AM_CONDITIONAL([LINUX], [test x$lb_target_os = xlinux]) AM_CONDITIONAL([USES_DPKG], [test x$uses_dpkg = xyes]) AM_CONDITIONAL([USE_QUILT], [test x$use_quilt = xyes]) +AM_CONDITIONAL([RHEL], [test x$RHEL_KERNEL = xyes]) +AM_CONDITIONAL([SUSE], [test x$SUSE_KERNEL = xyes]) # Sanity check for PCLMULQDQ instruction availability # PCLMULQDQ instruction is a new instruction available beginning with @@ -439,7 +369,7 @@ AS_IF([test x$target_cpu = "xx86_64" -a x$target_vendor != "xk1om"], LIBCFS_CONDITIONALS LN_CONDITIONALS LC_CONDITIONALS -]) # LB_CONTITIONALS +]) # LB_CONDITIONALS # # LB_CONFIG_FILES @@ -454,9 +384,6 @@ AC_DEFUN([LB_CONFIG_FILES], [ [Rules:build/Rules.in] AC_PACKAGE_TARNAME[.spec] AC_PACKAGE_TARNAME[-dkms.spec] - contrib/Makefile - contrib/lbuild/Makefile - contrib/scripts/Makefile ldiskfs/Makefile ldiskfs/autoMakefile lustre-iokit/Makefile @@ -467,6 +394,8 @@ AC_DEFUN([LB_CONFIG_FILES], [ lustre-iokit/ior-survey/Makefile lustre-iokit/stats-collect/Makefile ) + AC_CONFIG_FILES([lustre/scripts/dkms.mkconf], + [chmod +x lustre/scripts/dkms.mkconf]) ]) # @@ -519,23 +448,33 @@ AS_IF([test x$enable_server = xyes], # # The purpose of this function is to assemble command line options # for the rpmbuild command based on the options passed to the configure -# script, and also upon the descisions that configure makes based on +# script, and also upon the decisions that configure makes based on # the tests that it runs. # These strings can be passed to rpmbuild on the command line # in the Make targets named "rpms" and "srpm". # AC_DEFUN([LB_CONFIG_RPMBUILD_OPTIONS], [ RPMBINARGS= -RPMSRCARGS= CONFIGURE_ARGS= eval set -- $ac_configure_args for arg; do case $arg in - --with-release=* ) ;; + --*dir=* ) ;; + -C | --cache-file=* ) ;; + --prefix=* | --*-prefix=* ) ;; + --enable-dist ) ;; --with-kmp-moddir=* ) ;; --with-linux=* | --with-linux-obj=* ) ;; - --enable-tests | --disable-tests ) ;; + --enable-shared | --disable-shared ) ;; + --enable-static | --disable-static ) ;; + --enable-ldiskfs | --disable-ldiskfs ) ;; --enable-modules | --disable-modules ) ;; + --enable-server | --disable-server ) ;; + --enable-tests | --disable-tests ) ;; + --enable-utils | --disable-utils ) ;; + --enable-iokit | --disable-iokit ) ;; + --enable-dlc | --disable-dlc ) ;; + --enable-manpages | --disable-manpages ) ;; * ) CONFIGURE_ARGS="$CONFIGURE_ARGS '$arg'" ;; esac done @@ -548,39 +487,17 @@ if test -n "$LINUX" ; then RPMBINARGS="$RPMBINARGS --define \"kobjdir $LINUX_OBJ\"" fi fi -if test -n "$KMP_MODDIR" ; then - RPMBINARGS="$RPMBINARGS --define \"kmoddir $KMP_MODDIR\"" -fi -if test -n "$CROSS_PATH" ; then - if test x$enable_server = xyes ; then - echo -e "\n" - "*** Don't support cross compilation for the Intel(R) Xeon Phi(TM) card.\n" - exit 1 - fi - CROSS_SUFFIX="-mic" - RPMBINARGS="$RPMBINARGS --define \"post_script build/gen_filelist.sh\"" - RPMBINARGS="$RPMBINARGS --define \"cross_path $CROSS_PATH\"" - RPMBINARGS="$RPMBINARGS --define \"rootdir %{cross_path}\"" - RPMBINARGS="$RPMBINARGS --define \"_prefix %{cross_path}/usr\"" - RPMBINARGS="$RPMBINARGS --define \"_mandir %{_prefix}/share/man\"" - RPMBINARGS="$RPMBINARGS --define \"_sysconfdir %{cross_path}/etc\"" - RPMBINARGS="$RPMBINARGS --define \"make_args $CROSS_VARS\"" - if test x$CC_TARGET_ARCH = x"x86_64-k1om-linux" ; then - RPMBINARGS="$RPMBINARGS --define \"cross_requires intel-mic-gpl\"" - fi -fi if test x$enable_modules != xyes ; then RPMBINARGS="$RPMBINARGS --without lustre_modules" fi if test x$enable_tests != xyes ; then RPMBINARGS="$RPMBINARGS --without lustre_tests" - RPMSRCARGS="$RPMSRCARGS --without lustre_tests" +fi +if test x$enable_utils != xyes ; then + RPMBINARGS="$RPMBINARGS --without lustre_utils" fi if test x$enable_server != xyes ; then RPMBINARGS="$RPMBINARGS --without servers" - if test -n "$CROSS_SUFFIX" ; then - RPMBINARGS="$RPMBINARGS --define \"lustre_name lustre-client$CROSS_SUFFIX\"" - fi fi if test x$enable_ldiskfs != xyes ; then RPMBINARGS="$RPMBINARGS --without ldiskfs" @@ -590,14 +507,23 @@ if test x$enable_zfs = xyes ; then fi if test x$enable_iokit != xyes ; then RPMBINARGS="$RPMBINARGS --without lustre_iokit" - RPMSRCARGS="$RPMSRCARGS --without lustre_iokit" +fi +if test x$USE_DLC = xyes ; then + RPMBINARGS="$RPMBINARGS --with lnet_dlc" +fi +if test x$enable_manpages != xyes ; then + RPMBINARGS="$RPMBINARGS --without manpages" +fi +if test x$enable_shared != xyes ; then + RPMBINARGS="$RPMBINARGS --without shared" +fi +if test x$enable_static != xyes ; then + RPMBINARGS="$RPMBINARGS --without static" fi RPMBUILD_BINARY_ARGS=$RPMBINARGS -RPMBUILD_SOURCE_ARGS=$RPMSRCARGS AC_SUBST(RPMBUILD_BINARY_ARGS) -AC_SUBST(RPMBUILD_SOURCE_ARGS) ]) # LB_CONFIG_RPMBUILD_OPTIONS # @@ -614,7 +540,6 @@ LB_CONFIG_DIST LB_DOWNSTREAM_RELEASE LB_USES_DPKG -LB_BUILDID LB_LIBCFS_DIR @@ -627,20 +552,21 @@ LB_PROG_CC LC_OSD_ADDON LB_CONFIG_DOCS +LB_CONFIG_MANPAGES LB_CONFIG_UTILS LB_CONFIG_TESTS LC_CONFIG_CLIENT LB_CONFIG_MPITESTS LB_CONFIG_SERVERS -# two macros for cmd3 -m4_ifdef([LC_CONFIG_SPLIT], [LC_CONFIG_SPLIT]) +# Tests depends from utils (multiop from liblustreapi) +AS_IF([test "x$enable_utils" = xno], [enable_tests="no"]) + m4_ifdef([LC_NODEMAP_PROC_DEBUG], [LC_NODEMAP_PROC_DEBUG]) -LN_CONFIG_CDEBUG +LIBCFS_CONFIG_CDEBUG LC_QUOTA -LN_CONFIG_USERSPACE - +LB_LIBMOUNT LB_PATH_SNMP LB_PATH_LUSTREIOKIT @@ -674,10 +600,8 @@ cat <<_ACEOF CC: $CC LD: $LD CPPFLAGS: $CPPFLAGS -LLCPPFLAGS: $LLCPPFLAGS CFLAGS: $CFLAGS EXTRA_KCFLAGS: $EXTRA_KCFLAGS -LLCFLAGS: $LLCFLAGS Type 'make' to build Lustre. _ACEOF