Minor stylistic improvements in the SPECIAL_INSTALLCHECKS section, mainly
to reduce the number of wrapped lines. Suggested by: bde
This commit is contained in:
parent
9203287aef
commit
b7d4457608
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=126612
@ -355,49 +355,50 @@ SPECIAL_INSTALLCHECKS=
|
|||||||
.if ${TARGET_ARCH} == "sparc64"
|
.if ${TARGET_ARCH} == "sparc64"
|
||||||
SPECIAL_INSTALLCHECKS+=sparc64_installcheck
|
SPECIAL_INSTALLCHECKS+=sparc64_installcheck
|
||||||
|
|
||||||
CUR_TIMETYPE!= grep __time_t /usr/include/machine/_types.h | awk '{print $$2}'
|
CUR_TIMET!= grep __time_t /usr/include/machine/_types.h | awk '{print $$2}'
|
||||||
SRC_TIMETYPE!= grep __time_t ${.CURDIR}/sys/sparc64/include/_types.h | awk '{print $$2}'
|
SRC_TIMET!= grep __time_t ${.CURDIR}/sys/sparc64/include/_types.h | \
|
||||||
NEWSPARC_TIMETYPE?=${CUR_TIMETYPE}
|
awk '{print $$2}'
|
||||||
THISHOST!= hostname -s
|
NEWSPARC_TIMETYPE?=${CUR_TIMET}
|
||||||
.if ${THISHOST} == ""
|
THISHOST!= hostname -s
|
||||||
|
.if empty(THISHOST)
|
||||||
THISHOST="name not set yet"
|
THISHOST="name not set yet"
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
sparc64_installcheck:
|
sparc64_installcheck:
|
||||||
.if ${CUR_TIMETYPE} != ${SRC_TIMETYPE}
|
.if ${CUR_TIMET} != ${SRC_TIMET}
|
||||||
@echo ""
|
@echo
|
||||||
.if ${NEWSPARC_TIMETYPE} != ${SRC_TIMETYPE}
|
.if ${NEWSPARC_TIMETYPE} != ${SRC_TIMET}
|
||||||
@echo "*** ERROR: This target would change the type used for time_t! ***"
|
@echo "*** ERROR: This target would change the type used for time_t!"
|
||||||
.else
|
.else
|
||||||
@echo "* Note: This installation changes the type used for time_t"
|
@echo "* Note: This installation changes the type used for time_t."
|
||||||
.endif
|
.endif
|
||||||
@echo "* "
|
@echo "* "
|
||||||
@echo "* This host (${THISHOST}) presently has a time_t of type ${CUR_TIMETYPE},"
|
@echo "* This host (${THISHOST}) presently has a time_t of type ${CUR_TIMET},"
|
||||||
@echo "* and this installation will switch time_t to be type ${SRC_TIMETYPE}."
|
@echo "* and this installation will switch time_t to be type ${SRC_TIMET}."
|
||||||
.if ${NEWSPARC_TIMETYPE} != ${SRC_TIMETYPE}
|
.if ${NEWSPARC_TIMETYPE} != ${SRC_TIMET}
|
||||||
@echo "* "
|
@echo "* "
|
||||||
@echo "* If that is *NOT* what you wanted, then you need to change the"
|
@echo "* If that is *NOT* what you wanted, then you need to change the"
|
||||||
@echo "* typedef for __time_t in: ${.CURDIR}/sys/sparc64/include/_types.h"
|
@echo "* typedef of __time_t in ${.CURDIR}/sys/sparc64/include/_types.h"
|
||||||
@echo "* from '${SRC_TIMETYPE}' to '${CUR_TIMETYPE}'. After that you *MUST* do a"
|
@echo "* from '${SRC_TIMET}' to '${CUR_TIMET}'. After that you *MUST*"
|
||||||
@echo "* complete cleanworld, buildworld, buildkernel before you retry"
|
@echo "* do a complete cleanworld, buildworld, buildkernel before you"
|
||||||
@echo "* your 'make' command. Also read /usr/src/UPDATING.64BTT."
|
@echo "* retry the 'make' command. Also read /usr/src/UPDATING.64BTT."
|
||||||
@echo "* "
|
@echo "* "
|
||||||
@echo "* If that *is* what you want, then enter the commands:"
|
@echo "* If that *is* what you want, then enter the commands:"
|
||||||
@echo " NEWSPARC_TIMETYPE=${SRC_TIMETYPE}"
|
@echo " NEWSPARC_TIMETYPE=${SRC_TIMET}"
|
||||||
@echo " export NEWSPARC_TIMETYPE"
|
@echo " export NEWSPARC_TIMETYPE"
|
||||||
@echo "* and repeat your 'make' command."
|
@echo "* and repeat your 'make' command."
|
||||||
@echo ""
|
@echo
|
||||||
false
|
false
|
||||||
.endif
|
.endif
|
||||||
@echo ""
|
@echo
|
||||||
.elif ${NEWSPARC_TIMETYPE} != ${SRC_TIMETYPE}
|
.elif ${NEWSPARC_TIMETYPE} != ${SRC_TIMET}
|
||||||
@echo ""
|
@echo
|
||||||
@echo "*** ERROR: The variable NEWSPARC_TIMETYPE is set to '${NEWSPARC_TIMETYPE}'"
|
@echo "*** ERROR: NEWSPARC_TIMETYPE is set to '${NEWSPARC_TIMETYPE}'"
|
||||||
@echo "*** but ${.CURDIR}/sys/sparc64/include/_types.h"
|
@echo "*** but ${.CURDIR}/sys/sparc64/include/_types.h"
|
||||||
@echo "*** has __time_t defined as: '${SRC_TIMETYPE}'"
|
@echo "*** has __time_t defined as '${SRC_TIMET}'."
|
||||||
false
|
false
|
||||||
.else
|
.else
|
||||||
@# in sparc64_installcheck, all TIMETYPEs == '${NEWSPARC_TIMETYPE}'
|
@# in sparc64_installcheck, all TIMETYPEs == '${CUR_TIMET}'
|
||||||
.endif
|
.endif
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user