* Stop unconditionally forcing the compiler to cc or gcc in configure,

    allowing, among other things, building the kernel module with a
    compiler other than the default system compiler.  (Closes: #338306)

diff --git a/aclocal.m4 b/aclocal.m4
index 7e8ef233671e14faa2059205d2c240f48ba77a05..1df8eef3c587ca558fe6af3444aa4a4b860298cc 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -3105,9 +3105,8 @@ AC_DEFUN([OPENAFS_OSCONF], [
 dnl defaults, override in case below as needed
 XCFLAGS='${DBG} ${OPTMZ}'
 SHLIB_SUFFIX="so"
-CC="cc"
-CCOBJ="cc"
-MT_CC="cc"
+CCOBJ=$CC
+MT_CC=$CC
 XLIBS="${LIB_AFSDB}"
 
 dnl debugging and optimization flag defaults
@@ -3391,9 +3390,8 @@ case $AFS_SYSNAME in
                ;;
 
        i386_umlinux22)
-               CC="gcc -pipe"
-               CCOBJ="gcc -pipe"
-               MT_CC="gcc -pipe"
+               CCOBJ="${CC} -pipe"
+               MT_CC="${CC} -pipe"
                KERN_OPTMZ=-O2
                LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
@@ -3408,9 +3406,8 @@ case $AFS_SYSNAME in
                ;;
 
        i386_linux*)
-               CC="gcc -pipe"
-               CCOBJ="gcc -pipe"
-               MT_CC="gcc -pipe"
+               CCOBJ="${CC} -pipe"
+               MT_CC="${CC} -pipe"
                KERN_OPTMZ=-O2
                LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
@@ -3429,9 +3426,8 @@ case $AFS_SYSNAME in
                ;;
 
        i386_umlinux24)
-               CC="gcc -pipe"
-               CCOBJ="gcc -pipe"
-               MT_CC="gcc -pipe"
+               CCOBJ="${CC} -pipe"
+               MT_CC="${CC} -pipe"
                KERN_OPTMZ=-O2
                LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
@@ -3450,9 +3446,8 @@ case $AFS_SYSNAME in
                ;;
 
        i386_umlinux26)
-               CC="gcc -pipe"
-               CCOBJ="gcc -pipe"
-               MT_CC="gcc -pipe"
+               CCOBJ="${CC} -pipe"
+               MT_CC="${CC} -pipe"
                KERN_OPTMZ=-O2
                LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
@@ -3630,8 +3625,7 @@ case $AFS_SYSNAME in
                ;;
 
        s390_linux22)
-               CC="gcc"
-               CCOBJ="gcc"
+               CCOBJ="$CC"
                LD="ld"
                KERN_OPTMZ=-O2
                LEX="flex -l"
@@ -3648,8 +3642,7 @@ case $AFS_SYSNAME in
                ;;
 
        s390_linux24|s390_linux26)
-               CC="gcc"
-               CCOBJ="gcc"
+               CCOBJ="$CC"
                LD="ld"
                KERN_OPTMZ=-O2
                LEX="flex -l"
@@ -3666,8 +3659,7 @@ case $AFS_SYSNAME in
                ;;
 
        s390x_linux24|s390x_linux26)
-               CC="gcc"
-               CCOBJ="gcc"
+               CCOBJ="$CC"
                LD="ld"
                KERN_OPTMZ=-O2
                LEX="flex -l"

diff --git a/configure b/configure
index 42e76418f99d1a52900d24a87d17cfe48d1e3fc6..ef7a48c2f3826f507a11d443d3926aa8c4ba5bd9 100755 (executable)
--- a/configure
+++ b/configure
@@ -6613,9 +6613,8 @@ fi
 
 XCFLAGS='${DBG} ${OPTMZ}'
 SHLIB_SUFFIX="so"
-CC="cc"
-CCOBJ="cc"
-MT_CC="cc"
+CCOBJ=$CC
+MT_CC=$CC
 XLIBS="${LIB_AFSDB}"
 
 KERN_DBG=-g
@@ -7195,9 +7194,8 @@ case $AFS_SYSNAME in
                ;;
 
        i386_umlinux22)
-               CC="gcc -pipe"
-               CCOBJ="gcc -pipe"
-               MT_CC="gcc -pipe"
+               CCOBJ="${CC} -pipe"
+               MT_CC="${CC} -pipe"
                KERN_OPTMZ=-O2
                LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
@@ -7212,9 +7210,8 @@ case $AFS_SYSNAME in
                ;;
 
        i386_linux*)
-               CC="gcc -pipe"
-               CCOBJ="gcc -pipe"
-               MT_CC="gcc -pipe"
+               CCOBJ="${CC} -pipe"
+               MT_CC="${CC} -pipe"
                KERN_OPTMZ=-O2
                LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
@@ -7233,9 +7230,8 @@ case $AFS_SYSNAME in
                ;;
 
        i386_umlinux24)
-               CC="gcc -pipe"
-               CCOBJ="gcc -pipe"
-               MT_CC="gcc -pipe"
+               CCOBJ="${CC} -pipe"
+               MT_CC="${CC} -pipe"
                KERN_OPTMZ=-O2
                LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
@@ -7254,9 +7250,8 @@ case $AFS_SYSNAME in
                ;;
 
        i386_umlinux26)
-               CC="gcc -pipe"
-               CCOBJ="gcc -pipe"
-               MT_CC="gcc -pipe"
+               CCOBJ="${CC} -pipe"
+               MT_CC="${CC} -pipe"
                KERN_OPTMZ=-O2
                LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
@@ -7434,8 +7429,7 @@ case $AFS_SYSNAME in
                ;;
 
        s390_linux22)
-               CC="gcc"
-               CCOBJ="gcc"
+               CCOBJ="$CC"
                LD="ld"
                KERN_OPTMZ=-O2
                LEX="flex -l"
@@ -7452,8 +7446,7 @@ case $AFS_SYSNAME in
                ;;
 
        s390_linux24|s390_linux26)
-               CC="gcc"
-               CCOBJ="gcc"
+               CCOBJ="$CC"
                LD="ld"
                KERN_OPTMZ=-O2
                LEX="flex -l"
@@ -7470,8 +7463,7 @@ case $AFS_SYSNAME in
                ;;
 
        s390x_linux24|s390x_linux26)
-               CC="gcc"
-               CCOBJ="gcc"
+               CCOBJ="$CC"
                LD="ld"
                KERN_OPTMZ=-O2
                LEX="flex -l"

diff --git a/configure-libafs b/configure-libafs
index 552d6e74f49a282433fea44cfc51dd43a1918940..3fc69ce9728c25528908b56d50283132474bef3f 100755 (executable)
--- a/configure-libafs
+++ b/configure-libafs
@@ -6613,9 +6613,8 @@ fi
 
 XCFLAGS='${DBG} ${OPTMZ}'
 SHLIB_SUFFIX="so"
-CC="cc"
-CCOBJ="cc"
-MT_CC="cc"
+CCOBJ=$CC
+MT_CC=$CC
 XLIBS="${LIB_AFSDB}"
 
 KERN_DBG=-g
@@ -7195,9 +7194,8 @@ case $AFS_SYSNAME in
                ;;
 
        i386_umlinux22)
-               CC="gcc -pipe"
-               CCOBJ="gcc -pipe"
-               MT_CC="gcc -pipe"
+               CCOBJ="${CC} -pipe"
+               MT_CC="${CC} -pipe"
                KERN_OPTMZ=-O2
                LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
@@ -7212,9 +7210,8 @@ case $AFS_SYSNAME in
                ;;
 
        i386_linux*)
-               CC="gcc -pipe"
-               CCOBJ="gcc -pipe"
-               MT_CC="gcc -pipe"
+               CCOBJ="${CC} -pipe"
+               MT_CC="${CC} -pipe"
                KERN_OPTMZ=-O2
                LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
@@ -7233,9 +7230,8 @@ case $AFS_SYSNAME in
                ;;
 
        i386_umlinux24)
-               CC="gcc -pipe"
-               CCOBJ="gcc -pipe"
-               MT_CC="gcc -pipe"
+               CCOBJ="${CC} -pipe"
+               MT_CC="${CC} -pipe"
                KERN_OPTMZ=-O2
                LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
@@ -7254,9 +7250,8 @@ case $AFS_SYSNAME in
                ;;
 
        i386_umlinux26)
-               CC="gcc -pipe"
-               CCOBJ="gcc -pipe"
-               MT_CC="gcc -pipe"
+               CCOBJ="${CC} -pipe"
+               MT_CC="${CC} -pipe"
                KERN_OPTMZ=-O2
                LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
@@ -7434,8 +7429,7 @@ case $AFS_SYSNAME in
                ;;
 
        s390_linux22)
-               CC="gcc"
-               CCOBJ="gcc"
+               CCOBJ="$CC"
                LD="ld"
                KERN_OPTMZ=-O2
                LEX="flex -l"
@@ -7452,8 +7446,7 @@ case $AFS_SYSNAME in
                ;;
 
        s390_linux24|s390_linux26)
-               CC="gcc"
-               CCOBJ="gcc"
+               CCOBJ="$CC"
                LD="ld"
                KERN_OPTMZ=-O2
                LEX="flex -l"
@@ -7470,8 +7463,7 @@ case $AFS_SYSNAME in
                ;;
 
        s390x_linux24|s390x_linux26)
-               CC="gcc"
-               CCOBJ="gcc"
+               CCOBJ="$CC"
                LD="ld"
                KERN_OPTMZ=-O2
                LEX="flex -l"

diff --git a/debian/changelog b/debian/changelog
index a41bcce89c84f2933ea0c0f36353d256edadddbf..9afb9a84fe7d0b992619d112782dedc07bce9f94 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ openafs (1.4.0-3) unstable; urgency=low
 
   * Apply patch to allow the module to build with the Ubuntu kernel.
     Thanks, Björn Torkelsson.  (Closes: #342607)
+  * Stop unconditionally forcing the compiler to cc or gcc in configure,
+    allowing, among other things, building the kernel module with a
+    compiler other than the default system compiler.  (Closes: #338306)
   * Document FAM's lack of support for AFS's security model and recommend
     gamin instead.  (Closes: #343246)
   * Add a hint to README.Debian on what to do about the cache partition if

diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
index 003cbd51d64174638e6e82837bdb4238135b0d63..a1e2f87675f97662b440e4d107dbade42441b2f9 100644 (file)
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@ -4,9 +4,8 @@ AC_DEFUN([OPENAFS_OSCONF], [
 dnl defaults, override in case below as needed
 XCFLAGS='${DBG} ${OPTMZ}'
 SHLIB_SUFFIX="so"
-CC="cc"
-CCOBJ="cc"
-MT_CC="cc"
+CCOBJ=$CC
+MT_CC=$CC
 XLIBS="${LIB_AFSDB}"
 
 dnl debugging and optimization flag defaults
@@ -290,9 +289,8 @@ case $AFS_SYSNAME in
                ;;
 
        i386_umlinux22)
-               CC="gcc -pipe"
-               CCOBJ="gcc -pipe"
-               MT_CC="gcc -pipe"
+               CCOBJ="${CC} -pipe"
+               MT_CC="${CC} -pipe"
                KERN_OPTMZ=-O2
                LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
@@ -307,9 +305,8 @@ case $AFS_SYSNAME in
                ;;
 
        i386_linux*)
-               CC="gcc -pipe"
-               CCOBJ="gcc -pipe"
-               MT_CC="gcc -pipe"
+               CCOBJ="${CC} -pipe"
+               MT_CC="${CC} -pipe"
                KERN_OPTMZ=-O2
                LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
@@ -328,9 +325,8 @@ case $AFS_SYSNAME in
                ;;
 
        i386_umlinux24)
-               CC="gcc -pipe"
-               CCOBJ="gcc -pipe"
-               MT_CC="gcc -pipe"
+               CCOBJ="${CC} -pipe"
+               MT_CC="${CC} -pipe"
                KERN_OPTMZ=-O2
                LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
@@ -349,9 +345,8 @@ case $AFS_SYSNAME in
                ;;
 
        i386_umlinux26)
-               CC="gcc -pipe"
-               CCOBJ="gcc -pipe"
-               MT_CC="gcc -pipe"
+               CCOBJ="${CC} -pipe"
+               MT_CC="${CC} -pipe"
                KERN_OPTMZ=-O2
                LEX="flex -l"
                MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
@@ -529,8 +524,7 @@ case $AFS_SYSNAME in
                ;;
 
        s390_linux22)
-               CC="gcc"
-               CCOBJ="gcc"
+               CCOBJ="$CC"
                LD="ld"
                KERN_OPTMZ=-O2
                LEX="flex -l"
@@ -547,8 +541,7 @@ case $AFS_SYSNAME in
                ;;
 
        s390_linux24|s390_linux26)
-               CC="gcc"
-               CCOBJ="gcc"
+               CCOBJ="$CC"
                LD="ld"
                KERN_OPTMZ=-O2
                LEX="flex -l"
@@ -565,8 +558,7 @@ case $AFS_SYSNAME in
                ;;
 
        s390x_linux24|s390x_linux26)
-               CC="gcc"
-               CCOBJ="gcc"
+               CCOBJ="$CC"
                LD="ld"
                KERN_OPTMZ=-O2
                LEX="flex -l"