mirror of
https://git.openafs.org/openafs.git
synced 2025-01-19 15:30:14 +00:00
osconf: reduplicate systype stuff
in some cases there is more to do, and in some cases we probably already didn't build anymore, but, let's simplify. (cherry picked from commit XXX) Change-Id: I48248c2fc081413536763f09608e00153c4ea3ee Reviewed-on: http://gerrit.openafs.org/4292 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementia.org>
This commit is contained in:
Derrick Brashear
parent
911b258304
commit
829dd0bfc0
257
src/cf/osconf.m4
257
src/cf/osconf.m4
@ -49,7 +49,7 @@ case $AFS_SYSNAME in
|
||||
SHLIB_LINKER="${CC} -all -shared -expect_unresolved \"*\""
|
||||
;;
|
||||
|
||||
alpha_dux50)
|
||||
alpha_dux50 | alpha_dux51)
|
||||
CC="cc"
|
||||
CCOBJ="cc"
|
||||
MT_CC="cc"
|
||||
@ -62,32 +62,7 @@ case $AFS_SYSNAME in
|
||||
SHLIB_LINKER="${CC} -all -shared -expect_unresolved \"*\""
|
||||
;;
|
||||
|
||||
alpha_dux51)
|
||||
CC="cc"
|
||||
CCOBJ="cc"
|
||||
MT_CC="cc"
|
||||
DBG="-g3"
|
||||
CSTATIC="-non_shared"
|
||||
LWP_OPTMZ="-O2"
|
||||
MT_CFLAGS='-D_REENTRANT=1 -pthread -DAFS_PTHREAD_ENV ${XCFLAGS}'
|
||||
MT_LIBS="-pthread -lpthread -lmach -lexc -lc"
|
||||
XCFLAGS="-D_NO_PROTO -DOSF"
|
||||
SHLIB_LINKER="${CC} -all -shared -expect_unresolved \"*\""
|
||||
;;
|
||||
|
||||
alpha_linux_22)
|
||||
KERN_OPTMZ=-O2
|
||||
MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
|
||||
MT_LIBS="-lpthread"
|
||||
PAM_OPTMZ=-O2
|
||||
PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
|
||||
SHLIB_CFLAGS="-fPIC"
|
||||
SHLIB_LDFLAGS="-shared -Xlinker -x"
|
||||
XCFLAGS="-D_LARGEFILE64_SOURCE"
|
||||
SHLIB_LINKER="${MT_CC} -shared"
|
||||
;;
|
||||
|
||||
alpha_linux_24)
|
||||
alpha_linux_22 | alpha_linux_24 | alpha_linux_26)
|
||||
CCOBJ="${CC} -fPIC"
|
||||
KERN_OPTMZ=-O2
|
||||
MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
|
||||
@ -100,33 +75,7 @@ case $AFS_SYSNAME in
|
||||
SHLIB_LINKER="${MT_CC} -shared"
|
||||
;;
|
||||
|
||||
alpha_linux_26)
|
||||
CCOBJ="${CC} -fPIC"
|
||||
KERN_OPTMZ=-O2
|
||||
MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
|
||||
MT_LIBS="-lpthread"
|
||||
PAM_OPTMZ=-O2
|
||||
PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
|
||||
SHLIB_CFLAGS="-fPIC"
|
||||
SHLIB_LDFLAGS="-shared -Xlinker -x"
|
||||
XCFLAGS="-D_LARGEFILE64_SOURCE"
|
||||
SHLIB_LINKER="${MT_CC} -shared"
|
||||
;;
|
||||
|
||||
arm_linux24)
|
||||
CCOBJ="${CC} -fPIC"
|
||||
KERN_OPTMZ=-O2
|
||||
MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
|
||||
MT_LIBS="-lpthread"
|
||||
PAM_OPTMZ=-O2
|
||||
PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
|
||||
SHLIB_CFLAGS="-fPIC"
|
||||
SHLIB_LDFLAGS="-shared -Xlinker -x"
|
||||
XCFLAGS="-D_LARGEFILE64_SOURCE"
|
||||
SHLIB_LINKER="${MT_CC} -shared"
|
||||
;;
|
||||
|
||||
arm_linux26)
|
||||
arm_linux24 | arm_linux26)
|
||||
CCOBJ="${CC} -fPIC"
|
||||
KERN_OPTMZ=-O2
|
||||
MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
|
||||
@ -301,19 +250,7 @@ case $AFS_SYSNAME in
|
||||
SHLIB_LINKER="${MT_CC} -shared"
|
||||
;;
|
||||
|
||||
ppc64_linux24)
|
||||
KERN_OPTMZ=-O2
|
||||
MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
|
||||
MT_LIBS="-lpthread"
|
||||
PAM_OPTMZ=-O2
|
||||
PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
|
||||
SHLIB_LDFLAGS="-shared -Xlinker -x"
|
||||
SHLIB_CFLAGS="-fPIC"
|
||||
XCFLAGS="-D_LARGEFILE64_SOURCE"
|
||||
SHLIB_LINKER="${MT_CC} -shared"
|
||||
;;
|
||||
|
||||
ppc64_linux26)
|
||||
ppc64_linux24 | ppc64_linux26)
|
||||
KERN_OPTMZ=-O2
|
||||
MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
|
||||
MT_LIBS="-lpthread"
|
||||
@ -325,18 +262,6 @@ case $AFS_SYSNAME in
|
||||
SHLIB_LINKER="${MT_CC} -shared"
|
||||
;;
|
||||
|
||||
i386_umlinux22)
|
||||
KERN_OPTMZ=-O2
|
||||
MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
|
||||
MT_LIBS="-lpthread"
|
||||
PAM_OPTMZ=-O2
|
||||
PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
|
||||
SHLIB_CFLAGS="-fPIC"
|
||||
SHLIB_LDFLAGS="-shared -Xlinker -x"
|
||||
XCFLAGS="-D_LARGEFILE64_SOURCE"
|
||||
SHLIB_LINKER="${MT_CC} -shared"
|
||||
;;
|
||||
|
||||
i386_linux*)
|
||||
KERN_OPTMZ=-O2
|
||||
MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
|
||||
@ -353,24 +278,7 @@ case $AFS_SYSNAME in
|
||||
SHLIB_LINKER="${MT_CC} -shared"
|
||||
;;
|
||||
|
||||
i386_umlinux24)
|
||||
KERN_OPTMZ=-O2
|
||||
MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
|
||||
MT_LIBS="-lpthread"
|
||||
DBG=-g
|
||||
KERN_DBG=-g
|
||||
LWP_DBG=-g
|
||||
LWP_OPTMZ=-O2
|
||||
OPTMZ=-O2
|
||||
PAM_OPTMZ=-O2
|
||||
PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
|
||||
SHLIB_CFLAGS="-fPIC"
|
||||
SHLIB_LDFLAGS="-shared -Xlinker -x"
|
||||
XCFLAGS="-D_LARGEFILE64_SOURCE"
|
||||
SHLIB_LINKER="${MT_CC} -shared"
|
||||
;;
|
||||
|
||||
i386_umlinux26)
|
||||
i386_umlinux22 | i386_umlinux24 | i386_umlinux26)
|
||||
KERN_OPTMZ=-O2
|
||||
MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
|
||||
MT_LIBS="-lpthread"
|
||||
@ -486,7 +394,7 @@ case $AFS_SYSNAME in
|
||||
XLIBS="${LIB_AFSDB} ${XBSA_XLIBS} -framework CoreFoundation"
|
||||
;;
|
||||
|
||||
*_darwin_100)
|
||||
*_darwin_100 | *_darwin_110 )
|
||||
AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration -framework SystemConfiguration -framework IOKit -framework CoreFoundation"
|
||||
MT_CFLAGS='-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS} ${ARCHFLAGS}'
|
||||
MT_LIBS="${LIB_AFSDB} -framework CoreFoundation"
|
||||
@ -533,40 +441,7 @@ case $AFS_SYSNAME in
|
||||
AIX64="#"
|
||||
;;
|
||||
|
||||
|
||||
rs_aix51)
|
||||
CC="cc"
|
||||
CCOBJ="cc"
|
||||
DBG=""
|
||||
LIBSYS_AIX_EXP="afsl.exp"
|
||||
MT_CC="xlc_r"
|
||||
MT_CFLAGS='-DAFS_PTHREAD_ENV ${XCFLAGS}'
|
||||
MT_LIBS="-lpthreads"
|
||||
SHLIB_SUFFIX="o"
|
||||
XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
|
||||
XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
|
||||
SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
|
||||
AIX32=""
|
||||
AIX64=""
|
||||
;;
|
||||
|
||||
rs_aix52)
|
||||
CC="cc"
|
||||
CCOBJ="cc"
|
||||
DBG=""
|
||||
LIBSYS_AIX_EXP="afsl.exp"
|
||||
MT_CC="xlc_r"
|
||||
MT_CFLAGS='-DAFS_PTHREAD_ENV ${XCFLAGS}'
|
||||
MT_LIBS="-lpthreads"
|
||||
SHLIB_SUFFIX="o"
|
||||
XCFLAGS="-K -D_NONSTD_TYPES -D_MBI=void"
|
||||
XLIBS="${LIB_AFSDB} ${LIB_libintl} -ldl"
|
||||
SHLIB_LINKER="${MT_CC} -bM:SRE -berok"
|
||||
AIX32=""
|
||||
AIX64=""
|
||||
;;
|
||||
|
||||
rs_aix53)
|
||||
rs_aix51 | rs_aix52 | rs_aix53)
|
||||
CC="cc"
|
||||
CCOBJ="cc"
|
||||
DBG="-g"
|
||||
@ -598,22 +473,7 @@ case $AFS_SYSNAME in
|
||||
AIX64=""
|
||||
;;
|
||||
|
||||
s390_linux22)
|
||||
LD="ld"
|
||||
KERN_OPTMZ=-O2
|
||||
MT_CC="$CC"
|
||||
MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
|
||||
MT_LIBS="-lpthread"
|
||||
PAM_OPTMZ=-O
|
||||
PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC"
|
||||
SHLIB_CFLAGS="-fPIC"
|
||||
SHLIB_LDFLAGS="-shared -Xlinker -x"
|
||||
OPTMZ=-O
|
||||
XCFLAGS="-D_LARGEFILE64_SOURCE"
|
||||
SHLIB_LINKER="${MT_CC} -shared"
|
||||
;;
|
||||
|
||||
s390_linux24|s390_linux26)
|
||||
s390_linux22|s390_linux24|s390_linux26)
|
||||
LD="ld"
|
||||
KERN_OPTMZ=-O2
|
||||
MT_CC="$CC"
|
||||
@ -746,66 +606,7 @@ case $AFS_SYSNAME in
|
||||
LWP_OPTMZ="-g"
|
||||
;;
|
||||
|
||||
sun4x_56)
|
||||
CC=$SOLARISCC
|
||||
CCOBJ=$SOLARISCC
|
||||
MT_CC=$SOLARISCC
|
||||
MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
|
||||
MT_LIBS="-lpthread -lsocket"
|
||||
PAM_CFLAGS="-KPIC"
|
||||
PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
|
||||
SHLIB_CFLAGS="-KPIC"
|
||||
SHLIB_LDFLAGS="-G -Bsymbolic"
|
||||
XCFLAGS="-dy -Bdynamic"
|
||||
XLIBELFA="-lelf"
|
||||
LD="/usr/ccs/bin/ld"
|
||||
XLIBKVM="-lkvm"
|
||||
XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
|
||||
SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
|
||||
LWP_OPTMZ="-g"
|
||||
;;
|
||||
|
||||
sun4x_57)
|
||||
CC=$SOLARISCC
|
||||
CCOBJ=$SOLARISCC
|
||||
LD="/usr/ccs/bin/ld"
|
||||
MT_CC=$SOLARISCC
|
||||
MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
|
||||
MT_LIBS="-lpthread -lsocket"
|
||||
PAM_CFLAGS="-KPIC"
|
||||
PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
|
||||
SHLIB_CFLAGS="-KPIC"
|
||||
SHLIB_LDFLAGS="-G -Bsymbolic"
|
||||
XCFLAGS64='${XCFLAGS} -xarch=v9'
|
||||
XCFLAGS="-dy -Bdynamic"
|
||||
XLIBELFA="-lelf"
|
||||
XLIBKVM="-lkvm"
|
||||
XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
|
||||
SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
|
||||
LWP_OPTMZ="-g"
|
||||
;;
|
||||
|
||||
sun4x_58)
|
||||
CC=$SOLARISCC
|
||||
CCOBJ=$SOLARISCC
|
||||
LD="/usr/ccs/bin/ld"
|
||||
MT_CC=$SOLARISCC
|
||||
MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
|
||||
MT_LIBS="-lpthread -lsocket"
|
||||
PAM_CFLAGS="-KPIC"
|
||||
PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
|
||||
SHLIB_CFLAGS="-KPIC"
|
||||
SHLIB_LDFLAGS="-G -Bsymbolic"
|
||||
XCFLAGS64='${XCFLAGS} -xarch=v9'
|
||||
XCFLAGS="-dy -Bdynamic"
|
||||
XLIBELFA="-lelf"
|
||||
XLIBKVM="-lkvm"
|
||||
XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
|
||||
SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
|
||||
LWP_OPTMZ="-g"
|
||||
;;
|
||||
|
||||
sun4x_59)
|
||||
sun4x_56|sun4x_57|sun4x_58|sun4x_59)
|
||||
CC=$SOLARISCC
|
||||
CCOBJ=$SOLARISCC
|
||||
LD="/usr/ccs/bin/ld"
|
||||
@ -865,45 +666,7 @@ case $AFS_SYSNAME in
|
||||
LWP_OPTMZ="-g"
|
||||
;;
|
||||
|
||||
sunx86_57)
|
||||
CC=$SOLARISCC
|
||||
CCOBJ=$SOLARISCC
|
||||
LD="/usr/ccs/bin/ld"
|
||||
MT_CC=$SOLARISCC
|
||||
MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
|
||||
MT_LIBS="-lpthread -lsocket"
|
||||
PAM_CFLAGS="-KPIC"
|
||||
PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
|
||||
SHLIB_CFLAGS="-KPIC"
|
||||
SHLIB_LDFLAGS="-G -Bsymbolic"
|
||||
XCFLAGS64='${XCFLAGS} -xarch=amd64'
|
||||
XCFLAGS="-dy -Bdynamic"
|
||||
XLIBELFA="-lelf"
|
||||
XLIBKVM="-lkvm"
|
||||
XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
|
||||
SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
|
||||
;;
|
||||
|
||||
sunx86_58)
|
||||
CC=$SOLARISCC
|
||||
CCOBJ=$SOLARISCC
|
||||
LD="/usr/ccs/bin/ld"
|
||||
MT_CC=$SOLARISCC
|
||||
MT_CFLAGS='-mt -DAFS_PTHREAD_ENV ${XCFLAGS}'
|
||||
MT_LIBS="-lpthread -lsocket"
|
||||
PAM_CFLAGS="-KPIC"
|
||||
PAM_LIBS="-lc -lpam -lsocket -lnsl -lm"
|
||||
SHLIB_CFLAGS="-KPIC"
|
||||
SHLIB_LDFLAGS="-G -Bsymbolic"
|
||||
XCFLAGS64='${XCFLAGS} -xarch=amd64'
|
||||
XCFLAGS="-dy -Bdynamic"
|
||||
XLIBELFA="-lelf"
|
||||
XLIBKVM="-lkvm"
|
||||
XLIBS="${LIB_AFSDB} -lsocket -lnsl -lintl -ldl"
|
||||
SHLIB_LINKER="${CC} -G -dy -Bsymbolic -z text"
|
||||
;;
|
||||
|
||||
sunx86_59)
|
||||
sunx86_57|sunx86_58|sunx86_59)
|
||||
CC=$SOLARISCC
|
||||
CCOBJ=$SOLARISCC
|
||||
LD="/usr/ccs/bin/ld"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user