LU-7518 build: Remove the Phi accelerator-specific packaging

[fs/lustre-release.git] / config / lustre-build.m4

diff --git a/config/lustre-build.m4 b/config/lustre-build.m4
index a0bd33b..a748901 100644 (file)
--- a/config/lustre-build.m4
+++ b/config/lustre-build.m4
@@ -336,8 +336,8 @@ fi
 #
 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 +360,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 +396,6 @@ AS_IF([test $target_cpu = powerpc64], [
 
 CPPFLAGS="-I$PWD/$LIBCFS_INCLUDE_DIR -I$PWD/lnet/include -I$PWD/lustre/include $CPPFLAGS"
 
-LLCPPFLAGS="-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)
 
@@ -441,7 +434,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
@@ -469,6 +462,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])
 ])
 
 #
@@ -528,7 +523,6 @@ AS_IF([test x$enable_server = xyes],
 #
 AC_DEFUN([LB_CONFIG_RPMBUILD_OPTIONS], [
 RPMBINARGS=
-RPMSRCARGS=
 CONFIGURE_ARGS=
 eval set -- $ac_configure_args
 for arg; do
@@ -540,6 +534,8 @@ for arg; do
                --with-release=* ) ;;
                --with-kmp-moddir=* ) ;;
                --with-linux=* | --with-linux-obj=* ) ;;
+               --enable-shared | --disable-shared ) ;;
+               --enable-static | --disable-static ) ;;
                --enable-ldiskfs | --disable-ldiskfs ) ;;
                --enable-modules | --disable-modules ) ;;
                --enable-server | --disable-server ) ;;
@@ -563,24 +559,6 @@ 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
@@ -592,9 +570,6 @@ if test x$enable_utils != xyes ; then
 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"
@@ -611,12 +586,16 @@ 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
 
 #
@@ -657,7 +636,7 @@ LB_CONFIG_SERVERS
 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
 
 LB_PATH_SNMP
@@ -693,10 +672,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