jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-31 13:38:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build: Select param.h in sysname.m4

Browse Source 
Currently, the way the file that will be used as param.h is selected
doesn't allow us to choose headers from other architectures, making
cross-compiling difficult. In an effort to facilitate this process,
select the header that will be used as param.h in sysname.m4. By doing
this, we will have more flexibility to select which header should be
used (in future commits).

Change-Id: I5c77e9e061b847e770bf25f454fe891b5ead9429
Reviewed-on: https://gerrit.openafs.org/14914
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
This commit is contained in:
Marcio Barbosa 2022-02-14 15:09:27 -08:00 committed by Benjamin Kaduk
parent dc6ced5e6d
commit d456bd9b25
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cf/sysname.m4
View File

@ -375,4 +375,10 @@ case $AFS_SYSNAME in
*_linux_26) AFS_PARAM_COMMON=param.linux26.h ;;
*_fbsd_*) AFS_PARAM_COMMON=param.generic_fbsd.h ;;
esac
case $AFS_SYSNAME in
*)
AFS_PARAM=param.${AFS_SYSNAME}.h
;;
esac
])

1
src/cf/variables.m4
View File

@ -1,6 +1,7 @@
AC_DEFUN([OPENAFS_OUTPUT_VARIABLES],[
AC_SUBST(VFSCK)
AC_SUBST(AFS_SYSNAME)
AC_SUBST(AFS_PARAM)
AC_SUBST(AFS_PARAM_COMMON)
AC_SUBST(ENABLE_KERNEL_MODULE)
AC_SUBST(ENABLE_PTHREADED_UBIK)

1
src/config/Makefile.config.in
View File

@ -81,6 +81,7 @@ LINUX_VERS = @LINUX_VERSION@
LWP_OPTMZ = @LWP_OPTMZ@
LWP_DBG = @LWP_DBG@
MKAFS_OSTYPE = @MKAFS_OSTYPE@
AFS_PARAM = @AFS_PARAM@
AFS_PARAM_COMMON = @AFS_PARAM_COMMON@
MT_CC = @MT_CC@
MT_CFLAGS = @MT_CFLAGS@

6
src/config/Makefile.in
View File

@ -58,11 +58,11 @@ config.o: config.c AFS_component_version_number.c
# Include installation targets
#
param.h.new: ${srcdir}/param.${SYS_NAME}.h ${AFS_PARAM_COMMON}
param.h.new: ${srcdir}/${AFS_PARAM} ${AFS_PARAM_COMMON}
if [ "X${AFS_PARAM_COMMON}" != "X" ] ; then \
cat ${srcdir}/${AFS_PARAM_COMMON} ${srcdir}/param.${SYS_NAME}.h > param.h.new ; \
cat ${srcdir}/${AFS_PARAM_COMMON} ${srcdir}/${AFS_PARAM} > param.h.new ; \
else \
cat ${srcdir}/param.${SYS_NAME}.h > param.h.new ; \
cat ${srcdir}/${AFS_PARAM} > param.h.new ; \
fi
${DEST}/include/afs/param.h ${DESTDIR}${includedir}/afs/param.h ${TOP_INCDIR}/afs/param.h: param.h.new