drygdryg/calc
1
0
Fork 0
mirror of https://github.com/lcn2/calc.git synced 2025-08-16 01:03:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Release v2.12.9.1

Browse Source 
The following are the changes in this release:

    Fixed a typo typo in help/Makefile that caused the build of
    2.12.9.0 to fail in a number of cases.  Thanks to a report by
    <GitHub user balducci>.

    Pass form Makefile variables ${Q}, ${S}, ${E}, ${H} and ${V} down
    to all sub-directory Makefiles from the top level Makefile.
This commit is contained in:
Landon Curt Noll
2021-03-26 09:31:36 -07:00
parent a86d629982
commit eaec46982d
8 changed files with 155 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES
View File

@@ -4,6 +4,9 @@ The following are the changes from calc version 2.12.9.1 to date:
2.12.9.0 to fail in a number of cases. Thanks to a report by 2.12.9.0 to fail in a number of cases. Thanks to a report by
<GitHub user balducci>. <GitHub user balducci>.
Pass form Makefile variables ${Q}, ${S}, ${E}, ${H} and ${V} down
to all sub-directory Makefiles from the top level Makefile.
The following are the changes from calc version 2.12.8.2 to 2.12.9.0: The following are the changes from calc version 2.12.8.2 to 2.12.9.0:
@@ -37,7 +40,7 @@ The following are the changes from calc version 2.12.8.2 to 2.12.9.0:
Changed the UNUSED define in have_unused.h to be a macro with Changed the UNUSED define in have_unused.h to be a macro with
a parameter. Changed all use of UNUSED in *.c to be UNUSED(x). a parameter. Changed all use of UNUSED in *.c to be UNUSED(x).
Removed need for HAVE_UNUSED in building the have_unused.h file. Removed the need for HAVE_UNUSED in building the have_unused.h file.
CCBAN is given to ${CC} in order to control if banned.h is in effect. CCBAN is given to ${CC} in order to control if banned.h is in effect.

18
Makefile.ship
View File

@@ -1149,7 +1149,7 @@ EXT=
# The default calc versions # The default calc versions
# #
VERSION= 2.12.9.0 VERSION= 2.12.9.1
# Names of shared libraries with versions # Names of shared libraries with versions
# #
@@ -2106,6 +2106,7 @@ CUSTOM_PASSDOWN= \
TOP_MAKE_FILE=${MAKE_FILE} \ TOP_MAKE_FILE=${MAKE_FILE} \
TOUCH=${TOUCH} \ TOUCH=${TOUCH} \
TRUE=${TRUE} \ TRUE=${TRUE} \
V=${V} \
VERSION=${VERSION} \ VERSION=${VERSION} \
WNO_IMPLICT=${WNO_IMPLICT} \ WNO_IMPLICT=${WNO_IMPLICT} \
WNO_ERROR_LONG_LONG=${WNO_ERROR_LONG_LONG} \ WNO_ERROR_LONG_LONG=${WNO_ERROR_LONG_LONG} \
@@ -2128,6 +2129,7 @@ HELP_PASSDOWN= \
COMMON_CFLAGS="${COMMON_CFLAGS}" \ COMMON_CFLAGS="${COMMON_CFLAGS}" \
COMMON_LDFLAGS="${COMMON_LDFLAGS}" \ COMMON_LDFLAGS="${COMMON_LDFLAGS}" \
CP=${CP} \ CP=${CP} \
E="${E}" \
EXT=${EXT} \ EXT=${EXT} \
FMT=${FMT} \ FMT=${FMT} \
GREP=${GREP} \ GREP=${GREP} \
@@ -2145,13 +2147,15 @@ HELP_PASSDOWN= \
Q="${Q}" \ Q="${Q}" \
RM=${RM} \ RM=${RM} \
RMDIR=${RMDIR} \ RMDIR=${RMDIR} \
S="${S}" \
SCRIPTDIR="${SCRIPTDIR}" \ SCRIPTDIR="${SCRIPTDIR}" \
SED=${SED} \ SED=${SED} \
SHELL=${SHELL} \ SHELL=${SHELL} \
T=${T} \ T=${T} \
TOP_MAKE_FILE=${MAKE_FILE} \ TOP_MAKE_FILE=${MAKE_FILE} \
TOUCH=${TOUCH} \ TOUCH=${TOUCH} \
TRUE=${TRUE} TRUE=${TRUE} \
V=${V}
# The complete list of Makefile vars passed down to cal/Makefile. # The complete list of Makefile vars passed down to cal/Makefile.
# #
@@ -2165,6 +2169,7 @@ CAL_PASSDOWN= \
CMP=${CMP} \ CMP=${CMP} \
CO=${CO} \ CO=${CO} \
CP=${CP} \ CP=${CP} \
E="${E}" \
H="${H}" \ H="${H}" \
HELPDIR="${HELPDIR}" \ HELPDIR="${HELPDIR}" \
INCDIR="${INCDIR}" \ INCDIR="${INCDIR}" \
@@ -2176,12 +2181,14 @@ CAL_PASSDOWN= \
Q="${Q}" \ Q="${Q}" \
RM=${RM} \ RM=${RM} \
RMDIR=${RMDIR} \ RMDIR=${RMDIR} \
S="${S}" \
SCRIPTDIR="${SCRIPTDIR}" \ SCRIPTDIR="${SCRIPTDIR}" \
SHELL=${SHELL} \ SHELL=${SHELL} \
T=${T} \ T=${T} \
TOP_MAKE_FILE=${MAKE_FILE} \ TOP_MAKE_FILE=${MAKE_FILE} \
TOUCH=${TOUCH} \ TOUCH=${TOUCH} \
TRUE=${TRUE} TRUE=${TRUE} \
V=${V}
# The complete list of Makefile vars passed down to cscript/Makefile. # The complete list of Makefile vars passed down to cscript/Makefile.
# #
@@ -2195,6 +2202,7 @@ CSCRIPT_PASSDOWN= \
CMP=${CMP} \ CMP=${CMP} \
CO=${CO} \ CO=${CO} \
CP=${CP} \ CP=${CP} \
E="${E}" \
ECHON="${ECHON}" \ ECHON="${ECHON}" \
FMT=${FMT} \ FMT=${FMT} \
H="${H}" \ H="${H}" \
@@ -2208,6 +2216,7 @@ CSCRIPT_PASSDOWN= \
Q="${Q}" \ Q="${Q}" \
RM=${RM} \ RM=${RM} \
RMDIR=${RMDIR} \ RMDIR=${RMDIR} \
S="${S}" \
SCRIPTDIR="${SCRIPTDIR}" \ SCRIPTDIR="${SCRIPTDIR}" \
SED=${SED} \ SED=${SED} \
SHELL=${SHELL} \ SHELL=${SHELL} \
@@ -2215,7 +2224,8 @@ CSCRIPT_PASSDOWN= \
T=${T} \ T=${T} \
TOP_MAKE_FILE=${MAKE_FILE} \ TOP_MAKE_FILE=${MAKE_FILE} \
TOUCH=${TOUCH} \ TOUCH=${TOUCH} \
TRUE=${TRUE} TRUE=${TRUE} \
V=${V}
# complete list of .h files found (but not built) in the distribution # complete list of .h files found (but not built) in the distribution
# #

28
cal/Makefile
View File

@@ -176,11 +176,35 @@ T=
# Makefile debug # Makefile debug
# #
# Q=@ do not echo internal makefile actions (quiet mode) # Q=@ do not echo internal Makefile actions (quiet mode)
# Q= echo internal makefile actions (debug / verbose mode) # Q= echo internal Makefile actions (debug / verbose mode)
#
# H=@: do not report hsrc file formation progress
# H=@ do echo hsrc file formation progress
#
# S= >/dev/null 2>&1 slience ${CC} output during hsrc file formation
# S= full ${CC} output during hsrc file formation
#
# E= 2>/dev/null slience command stderr during hsrc file formation
# E= full command stderr during hsrc file formation
#
# V=@: do not echo debug statements (quiet mode)
# V=@ do echo debug statements (debug / verbose mode)
# #
#Q= #Q=
Q=@ Q=@
#
S= >/dev/null 2>&1
#S=
#
E= 2>/dev/null
#E=
#
#H=@:
H=@
#
V=@:
#V=@
# standard tools # standard tools
# #

28
cscript/Makefile
View File

@@ -175,11 +175,35 @@ T=
# Makefile debug # Makefile debug
# #
# Q=@ do not echo internal makefile actions (quiet mode) # Q=@ do not echo internal Makefile actions (quiet mode)
# Q= echo internal makefile actions (debug / verbose mode) # Q= echo internal Makefile actions (debug / verbose mode)
#
# H=@: do not report hsrc file formation progress
# H=@ do echo hsrc file formation progress
#
# S= >/dev/null 2>&1 slience ${CC} output during hsrc file formation
# S= full ${CC} output during hsrc file formation
#
# E= 2>/dev/null slience command stderr during hsrc file formation
# E= full command stderr during hsrc file formation
#
# V=@: do not echo debug statements (quiet mode)
# V=@ do echo debug statements (debug / verbose mode)
# #
#Q= #Q=
Q=@ Q=@
#
S= >/dev/null 2>&1
#S=
#
E= 2>/dev/null
#E=
#
#H=@:
H=@
#
V=@:
#V=@
# standard tools # standard tools
# #

32
custom/Makefile
View File

@@ -155,14 +155,38 @@ CUSTOM_OBJ= c_argv.o c_devnull.o c_help.o c_sysinfo.o c_pzasusb8.o \
# Normally, the upper level makefile will set these values. We provide # Normally, the upper level makefile will set these values. We provide
# a default here just in case you want to build from this directory. # a default here just in case you want to build from this directory.
#
# Makefile debug # Makefile debug
# #
# Q=@ do not echo internal makefile actions (quiet mode) # Q=@ do not echo internal Makefile actions (quiet mode)
# Q= echo internal makefile actions (debug / verbose mode) # Q= echo internal Makefile actions (debug / verbose mode)
#
# H=@: do not report hsrc file formation progress
# H=@ do echo hsrc file formation progress
#
# S= >/dev/null 2>&1 slience ${CC} output during hsrc file formation
# S= full ${CC} output during hsrc file formation
#
# E= 2>/dev/null slience command stderr during hsrc file formation
# E= full command stderr during hsrc file formation
#
# V=@: do not echo debug statements (quiet mode)
# V=@ do echo debug statements (debug / verbose mode)
# #
#Q= #Q=
Q=@ Q=@
#
S= >/dev/null 2>&1
#S=
#
E= 2>/dev/null
#E=
#
#H=@:
H=@
#
V=@:
#V=@
#### ####
# Normally, the upper level makefile will set these values. We provide # Normally, the upper level makefile will set these values. We provide
@@ -407,7 +431,7 @@ EXT=
# The default calc versions # The default calc versions
# #
VERSION= 2.12.9.0 VERSION= 2.12.9.1
# Names of shared libraries with versions # Names of shared libraries with versions
# #

32
custom/Makefile.head
View File

@@ -155,14 +155,38 @@ CUSTOM_OBJ= c_argv.o c_devnull.o c_help.o c_sysinfo.o c_pzasusb8.o \
# Normally, the upper level makefile will set these values. We provide # Normally, the upper level makefile will set these values. We provide
# a default here just in case you want to build from this directory. # a default here just in case you want to build from this directory.
#
# Makefile debug # Makefile debug
# #
# Q=@ do not echo internal makefile actions (quiet mode) # Q=@ do not echo internal Makefile actions (quiet mode)
# Q= echo internal makefile actions (debug / verbose mode) # Q= echo internal Makefile actions (debug / verbose mode)
#
# H=@: do not report hsrc file formation progress
# H=@ do echo hsrc file formation progress
#
# S= >/dev/null 2>&1 slience ${CC} output during hsrc file formation
# S= full ${CC} output during hsrc file formation
#
# E= 2>/dev/null slience command stderr during hsrc file formation
# E= full command stderr during hsrc file formation
#
# V=@: do not echo debug statements (quiet mode)
# V=@ do echo debug statements (debug / verbose mode)
# #
#Q= #Q=
Q=@ Q=@
#
S= >/dev/null 2>&1
#S=
#
E= 2>/dev/null
#E=
#
#H=@:
H=@
#
V=@:
#V=@
#### ####
# Normally, the upper level makefile will set these values. We provide # Normally, the upper level makefile will set these values. We provide
@@ -407,7 +431,7 @@ EXT=
# The default calc versions # The default calc versions
# #
VERSION= 2.12.9.0 VERSION= 2.12.9.1
# Names of shared libraries with versions # Names of shared libraries with versions
# #

32
help/Makefile
View File

@@ -176,11 +176,35 @@ T=
# Makefile debug # Makefile debug
# #
# Q=@ do not echo internal makefile actions (quiet mode) # Q=@ do not echo internal Makefile actions (quiet mode)
# Q= echo internal makefile actions (debug / verbose mode) # Q= echo internal Makefile actions (debug / verbose mode)
#
# H=@: do not report hsrc file formation progress
# H=@ do echo hsrc file formation progress
#
# S= >/dev/null 2>&1 slience ${CC} output during hsrc file formation
# S= full ${CC} output during hsrc file formation
#
# E= 2>/dev/null slience command stderr during hsrc file formation
# E= full command stderr during hsrc file formation
#
# V=@: do not echo debug statements (quiet mode)
# V=@ do echo debug statements (debug / verbose mode)
# #
#Q= #Q=
Q=@ Q=@
#
S= >/dev/null 2>&1
#S=
#
E= 2>/dev/null
#E=
#
#H=@:
H=@
#
V=@:
#V=@
# standard tools # standard tools
# #
@@ -637,8 +661,8 @@ builtin: builtin.top builtin.end ../func.c funclist.sed
${Q} ${SED} -n -f funclist.sed ../func.c > funclist.c ${Q} ${SED} -n -f funclist.sed ../func.c > funclist.c
${Q} ${RM} -f funclist.o funclist${EXT} ${Q} ${RM} -f funclist.o funclist${EXT}
${Q} ${LCC} ${ICFLAGS} -DFUNCLIST -I/usr/include \ ${Q} ${LCC} ${ICFLAGS} -DFUNCLIST -I/usr/include \
-I.. funclist.c -c 2>/dev/null -I.. funclist.c -c ${S}
${Q} ${LCC} ${ILDFLAGS} funclist.o -o funclist${EXT} ${Q} ${LCC} ${ILDFLAGS} funclist.o -o funclist${EXT} ${S}
${Q} ${RM} -f builtin ${Q} ${RM} -f builtin
${Q} ${GREP} -v '^#' builtin.top > builtin ${Q} ${GREP} -v '^#' builtin.top > builtin
${Q} ./funclist${EXT} | \ ${Q} ./funclist${EXT} | \

2
version.c
View File

@@ -54,7 +54,7 @@ static char *program;
#define MAJOR_VER 2 /* major library version */ #define MAJOR_VER 2 /* major library version */
#define MINOR_VER 12 /* minor library version */ #define MINOR_VER 12 /* minor library version */
#define MAJOR_PATCH 9 /* major software version level */ #define MAJOR_PATCH 9 /* major software version level */
#define MINOR_PATCH 0 /* minor software version level */ #define MINOR_PATCH 1 /* minor software version level */
/* /*