drop support for DJGPP and drop support for win32

Support for win32 and DJGPP has been dropped.  Calc version
2.14.3.5 was the last to make references to win32 and make
references to DJGPP.  Future versions of calc may work under
those systems, we just elected to remove the somewhat out of
date and awkward `win32.mkdef` and related win32 references.

If you are a win32 user, please feel free to create a win32
target in Makefile.target and submit as a pull request.
If you are a DJGPP user, please feel free to create a DJGPP
target in Makefile.target and submit as a pull request.
Until someone can test such systems, we prefer to wait
until someone is able to test and supply a pull request.
This commit is contained in:
Landon Curt Noll
2023-08-18 17:05:49 -07:00
parent 7ad1448a1a
commit ea57d2f24f
5 changed files with 41 additions and 291 deletions

13
CHANGES
View File

@@ -4,6 +4,19 @@ The following are the changes from calc version 2.14.3.5 to date:
target will be used. Thanks to GitHub user @iahung2 for the target will be used. Thanks to GitHub user @iahung2 for the
pull request. pull request.
Support for win32 and DJGPP has been dropped. Calc version
2.14.3.5 was the last to make references to win32 and make
references to DJGPP. Future versions of calc may work under
those systems, we just elected to remove the somewhat out of
date and awkward `win32.mkdef` and related win32 references.
If you are a win32 user, please feel free to create a win32
target in Makefile.target and submit as a pull request.
If you are a DJGPP user, please feel free to create a DJGPP
target in Makefile.target and submit as a pull request.
Until someone can test such systems, we prefer to wait
until someone is able to test and supply a pull request.
The following are the changes from calc version 2.14.3.4 to 2.14.3.5: The following are the changes from calc version 2.14.3.4 to 2.14.3.5:

View File

@@ -201,7 +201,7 @@ UTIL_C_SRC= align32.c endian.c longbits.c have_newstr.c have_uid_t.c \
# and BUILD_C_SRC # and BUILD_C_SRC
# #
UTIL_MISC_SRC= calcerr_h.sed calcerr_h.awk calcerr_c.sed calcerr_c.awk \ UTIL_MISC_SRC= calcerr_h.sed calcerr_h.awk calcerr_c.sed calcerr_c.awk \
calcerr.tbl check.awk win32.mkdef fposval.h.def calcerr.tbl check.awk fposval.h.def
# these .o files may get built in the process of building BUILD_H_SRC # these .o files may get built in the process of building BUILD_H_SRC
# #
@@ -334,7 +334,7 @@ TARGETS= ${EARLY_TARGETS} ${BLD_TYPE} ${LATE_TARGETS}
# #
PHONY= all calcliblist calc_version check chk clobber debug depend distdir \ PHONY= all calcliblist calc_version check chk clobber debug depend distdir \
distlist hsrc install inst_files mkdebug rpm sample splint tags \ distlist hsrc install inst_files mkdebug rpm sample splint tags \
uninstall win32_hsrc uninstall
############################################################ ############################################################
# Allow Makefile.local to change any of the above settings # # Allow Makefile.local to change any of the above settings #
@@ -978,12 +978,7 @@ terminal.h: ${MK_SET}
${Q} echo '#if !defined(USE_TERMIOS)' >> $@ ${Q} echo '#if !defined(USE_TERMIOS)' >> $@
${Q} echo '#if !defined(USE_TERMIO)' >> $@ ${Q} echo '#if !defined(USE_TERMIO)' >> $@
${Q} echo '#if !defined(USE_SGTTY)' >> $@ ${Q} echo '#if !defined(USE_SGTTY)' >> $@
-${Q} if [ X"${TERMCONTROL}" = X"-DUSE_WIN32" ]; then \ -${Q} if echo '#include <termios.h>' | ${CC} -E - ${S}; then \
echo '/* Windows, use none of these modes */' >> $@; \
echo '#undef USE_TERMIOS /* <termios.h> */' >> $@; \
echo '#undef USE_TERMIO /* <termio.h> */' >> $@; \
echo '#undef USE_SGTTY /* <sys/ioctl.h> */' >> $@; \
elif echo '#include <termios.h>' | ${CC} -E - ${S}; then \
echo '/* use termios */' >> $@; \ echo '/* use termios */' >> $@; \
echo '#define USE_TERMIOS /* <termios.h> */' >> $@; \ echo '#define USE_TERMIOS /* <termios.h> */' >> $@; \
echo '#undef USE_TERMIO /* <termio.h> */' >> $@; \ echo '#undef USE_TERMIO /* <termio.h> */' >> $@; \
@@ -2280,35 +2275,6 @@ have_strlcat.h: have_strlcat.c banned.h have_ban_pragma.h have_string.h \
${TRUE}; \ ${TRUE}; \
fi fi
###
#
# Build .h files for Windows based systems
#
# This is really a internal utility rule that is used to create the
# win32 sub-directory for distribution.
#
###
win32_hsrc: win32.mkdef banned.h have_ban_pragma.h alloc.h \
${MK_SET}
${H} echo 'forming win32 directory'
${Q} ${RM} -rf win32
${Q} ${MKDIR} -p win32
${Q} ${CP} banned.h have_ban_pragma.h alloc.h win32
${Q} ${CP} ${UTIL_C_SRC} win32
${Q} ${CP} ${UTIL_MISC_SRC} win32
${Q} ${CP} ${MK_SET} win32
${Q} (cd win32; \
echo "${MAKE} -f ${MAKE_FILE} hsrc `${CAT} win32.mkdef` EXT="; \
${MAKE} -f ${MAKE_FILE} hsrc `${CAT} win32.mkdef` EXT=; \
${RM} -f ${UTIL_C_SRC}; \
${RM} -f ${UTIL_MISC_SRC}; \
${RM} -f ${UTIL_OBJS}; \
${RM} -f ${UTIL_PROGS}; \
${RM} -f ${UTIL_FILES}; \
${RM} -f ${MK_SET})
${H} echo 'win32 directory formed'
### ###
# #
# These two .all rules are used to determine of the lower level # These two .all rules are used to determine of the lower level
@@ -2549,11 +2515,6 @@ distlist: ${DISTLIST} custom/Makefile
echo $$i; \ echo $$i; \
fi; \ fi; \
done; \ done; \
for i in ${BUILD_H_SRC} ${BUILD_C_SRC} /dev/null; do \
if [ X"$$i" != X"/dev/null" ]; then \
echo win32/$$i; \
fi; \
done; \
(cd help; ${MAKE} -f Makefile $@); \ (cd help; ${MAKE} -f Makefile $@); \
(cd cal; ${MAKE} -f Makefile $@); \ (cd cal; ${MAKE} -f Makefile $@); \
(cd custom; ${MAKE} -f Makefile $@); \ (cd custom; ${MAKE} -f Makefile $@); \
@@ -2562,7 +2523,6 @@ distlist: ${DISTLIST} custom/Makefile
distdir: custom/Makefile distdir: custom/Makefile
${Q} (echo .; \ ${Q} (echo .; \
echo win32; \
(cd help; ${MAKE} -f Makefile $@); \ (cd help; ${MAKE} -f Makefile $@); \
(cd cal; ${MAKE} -f Makefile $@); \ (cd cal; ${MAKE} -f Makefile $@); \
(cd custom; ${MAKE} -f Makefile $@); \ (cd custom; ${MAKE} -f Makefile $@); \
@@ -3151,7 +3111,7 @@ clean:
${RM} -rf lib ${RM} -rf lib
${RM} -f endian.h stdarg.h libcalcerr.a cal/obj help/obj ${RM} -f endian.h stdarg.h libcalcerr.a cal/obj help/obj
${RM} -f have_vs.c std_arg.h try_stdarg.c fnvhash.c ${RM} -f have_vs.c std_arg.h try_stdarg.c fnvhash.c
${RM} -f win32dll.h have_malloc.h math_error.h string.h string.c ${RM} -f have_malloc.h math_error.h string.h string.c
${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-=' ${V} echo '=-=-=-=-= ${MAKE_FILE} end of $@ rule =-=-=-=-='
clobber: clean clobber: clean
@@ -3199,7 +3159,7 @@ clobber: clean
cd cscript; ${MAKE} -f Makefile $@ cd cscript; ${MAKE} -f Makefile $@
${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-=' ${V} echo '=-=-=-=-= Back to the main Makefile for $@ rule =-=-=-=-='
${V} echo remove files that are obsolete ${V} echo remove files that are obsolete
${RM} -rf win32 build ${RM} -rf build
${RM} -f no_implicit.arg ${RM} -f no_implicit.arg
${RM} -f no_implicit.c no_implicit.o no_implicit${EXT} ${RM} -f no_implicit.c no_implicit.o no_implicit${EXT}
${RM} -f .static .dynamic calc-dynamic-only calc-static-only ${RM} -f .static .dynamic calc-dynamic-only calc-static-only
@@ -3489,10 +3449,6 @@ install: ${LIB_H_SRC} ${BUILD_H_SRC} calc.1 all custom/Makefile
${RM} -f ${T}${CALC_INCDIR}/std_arg.h; \ ${RM} -f ${T}${CALC_INCDIR}/std_arg.h; \
echo "removed old ${T}${CALC_INCDIR}/std_arg.h"; \ echo "removed old ${T}${CALC_INCDIR}/std_arg.h"; \
fi; \ fi; \
if [ -f "${T}${CALC_INCDIR}/win32dll.h" ]; then \
${RM} -f ${T}${CALC_INCDIR}/win32dll.h; \
echo "removed old ${T}${CALC_INCDIR}/win32dll.h"; \
fi; \
if [ -f "${T}${CALC_INCDIR}/have_malloc.h" ]; then \ if [ -f "${T}${CALC_INCDIR}/have_malloc.h" ]; then \
${RM} -f ${T}${CALC_INCDIR}/have_malloc.h; \ ${RM} -f ${T}${CALC_INCDIR}/have_malloc.h; \
echo "removed old ${T}${CALC_INCDIR}/have_malloc.h"; \ echo "removed old ${T}${CALC_INCDIR}/have_malloc.h"; \

View File

@@ -190,15 +190,12 @@ CCBAN= -UUNBAN
# -DUSE_SGTTY use struct sgttyb from <sys/ioctl.h> # -DUSE_SGTTY use struct sgttyb from <sys/ioctl.h>
# -DUSE_NOTHING Windows system, don't use any of them # -DUSE_NOTHING Windows system, don't use any of them
# #
# Select TERMCONTROL= -DUSE_TERMIOS for DJGPP.
#
# If in doubt, leave TERMCONTROL empty. # If in doubt, leave TERMCONTROL empty.
# #
TERMCONTROL= TERMCONTROL=
#TERMCONTROL= -DUSE_TERMIOS #TERMCONTROL= -DUSE_TERMIOS
#TERMCONTROL= -DUSE_TERMIO #TERMCONTROL= -DUSE_TERMIO
#TERMCONTROL= -DUSE_SGTTY #TERMCONTROL= -DUSE_SGTTY
#TERMCONTROL= -DUSE_WIN32
# If your system does not have a vsnprintf() function, you could be in trouble. # If your system does not have a vsnprintf() function, you could be in trouble.
# #
@@ -237,8 +234,6 @@ HAVE_VSNPRINTF=
# a make clobber and try -DCALC_LITTLE_ENDIAN. If that fails, ask a wizard # a make clobber and try -DCALC_LITTLE_ENDIAN. If that fails, ask a wizard
# for help. # for help.
# #
# Select CALC_BYTE_ORDER= -DCALC_LITTLE_ENDIAN for DJGPP.
#
CALC_BYTE_ORDER= CALC_BYTE_ORDER=
#CALC_BYTE_ORDER= -DBIG_ENDIAN #CALC_BYTE_ORDER= -DBIG_ENDIAN
#CALC_BYTE_ORDER= -DLITTLE_ENDIAN #CALC_BYTE_ORDER= -DLITTLE_ENDIAN
@@ -251,8 +246,6 @@ CALC_BYTE_ORDER=
# In order to avoid make brain damage in some systems, we avoid placing # In order to avoid make brain damage in some systems, we avoid placing
# a space after the ='s below. # a space after the ='s below.
# #
# Select CALC_CHARBIT= 8 for DJGPP.
#
CALC_CHARBIT= CALC_CHARBIT=
#CALC_CHARBIT= 8 #CALC_CHARBIT= 8
@@ -264,8 +257,6 @@ CALC_CHARBIT=
# In order to avoid make brain damage in some systems, we avoid placing # In order to avoid make brain damage in some systems, we avoid placing
# a space after the ='s below. # a space after the ='s below.
# #
# Select LONG_BITS= 32 for DJGPP.
#
LONG_BITS= LONG_BITS=
#LONG_BITS= 32 #LONG_BITS= 32
#LONG_BITS= 64 #LONG_BITS= 64
@@ -288,8 +279,6 @@ HAVE_FGETSETPOS=
# to determine if fpos_t has a __pos structure element. If HAVE_FPOS_POS # to determine if fpos_t has a __pos structure element. If HAVE_FPOS_POS
# is set to -DHAVE_NO_FPOS_POS, then calc assume there is no __pos element. # is set to -DHAVE_NO_FPOS_POS, then calc assume there is no __pos element.
# #
# Select HAVE_FPOS_POS= -DHAVE_NO_FPOS_POS for DJGPP.
#
# If in doubt, leave HAVE_FPOS_POS empty and this Makefile will figure it out. # If in doubt, leave HAVE_FPOS_POS empty and this Makefile will figure it out.
# #
HAVE_FPOS_POS= HAVE_FPOS_POS=
@@ -314,8 +303,6 @@ FPOS_POS_BITS=
# If FPOS_BITS is empty, then the Makefile will determine the size of # If FPOS_BITS is empty, then the Makefile will determine the size of
# the file position value. # the file position value.
# #
# Select FPOS_BITS= 32 for DJGPP.
#
# If in doubt, leave FPOS_BITS empty and this Makefile will figure it out. # If in doubt, leave FPOS_BITS empty and this Makefile will figure it out.
# #
FPOS_BITS= FPOS_BITS=
@@ -327,8 +314,6 @@ FPOS_BITS=
# If OFF_T_BITS is empty, then the Makefile will determine the size of # If OFF_T_BITS is empty, then the Makefile will determine the size of
# the file offset value. # the file offset value.
# #
# Select OFF_T_BITS= 32 for DJGPP.
#
# If in doubt, leave OFF_T_BITS empty and this Makefile will figure it out. # If in doubt, leave OFF_T_BITS empty and this Makefile will figure it out.
# #
OFF_T_BITS= OFF_T_BITS=
@@ -340,8 +325,6 @@ OFF_T_BITS=
# If DEV_BITS is empty, then the Makefile will determine the size of # If DEV_BITS is empty, then the Makefile will determine the size of
# the dev_t device value # the dev_t device value
# #
# Select DEV_BITS= 32 for DJGPP.
#
# If in doubt, leave DEV_BITS empty and this Makefile will figure it out. # If in doubt, leave DEV_BITS empty and this Makefile will figure it out.
# #
DEV_BITS= DEV_BITS=
@@ -354,8 +337,6 @@ DEV_BITS=
# If INODE_BITS is empty, then the Makefile will determine the size of # If INODE_BITS is empty, then the Makefile will determine the size of
# the ino_t inode value # the ino_t inode value
# #
# Select INODE_BITS= 32 for DJGPP.
#
# If in doubt, leave INODE_BITS empty and this Makefile will figure it out. # If in doubt, leave INODE_BITS empty and this Makefile will figure it out.
# #
INODE_BITS= INODE_BITS=
@@ -474,8 +455,6 @@ HAVE_MEMMOVE=
# -DHAVE_NO_USTAT, then calc will use internal functions to simulate # -DHAVE_NO_USTAT, then calc will use internal functions to simulate
# the ustat() function that gets file system statistics. # the ustat() function that gets file system statistics.
# #
# Select HAVE_USTAT= -DHAVE_NO_USTAT for DJGPP.
#
# If in doubt, leave HAVE_USTAT empty and this Makefile will figure it out. # If in doubt, leave HAVE_USTAT empty and this Makefile will figure it out.
# #
HAVE_USTAT= HAVE_USTAT=
@@ -488,8 +467,6 @@ HAVE_USTAT=
# -DHAVE_NO_STATFS, then calc will use internal functions to simulate # -DHAVE_NO_STATFS, then calc will use internal functions to simulate
# the statfs() function that gets file system statistics. # the statfs() function that gets file system statistics.
# #
# Select HAVE_STATFS= -DHAVE_NO_STATFS for DJGPP.
#
# If in doubt, leave HAVE_STATFS empty and this Makefile will figure it out. # If in doubt, leave HAVE_STATFS empty and this Makefile will figure it out.
# #
HAVE_STATFS= HAVE_STATFS=
@@ -501,8 +478,6 @@ HAVE_STATFS=
# HAVE_SYS_VFS_H= YES assume that the include file exists # HAVE_SYS_VFS_H= YES assume that the include file exists
# HAVE_SYS_VFS_H= NO assume that the include file does not exist # HAVE_SYS_VFS_H= NO assume that the include file does not exist
# #
# Select HAVE_SYS_VFS_H= NO for DJGPP.
#
# When in doubt, leave HAVE_SYS_VFS_H empty. # When in doubt, leave HAVE_SYS_VFS_H empty.
# #
HAVE_SYS_VFS_H= HAVE_SYS_VFS_H=
@@ -515,8 +490,6 @@ HAVE_SYS_VFS_H=
# HAVE_SYS_PARAM_H= YES assume that the include file exists # HAVE_SYS_PARAM_H= YES assume that the include file exists
# HAVE_SYS_PARAM_H= NO assume that the include file does not exist # HAVE_SYS_PARAM_H= NO assume that the include file does not exist
# #
# Select HAVE_SYS_PARAM_H= NO for DJGPP.
#
# When in doubt, leave HAVE_SYS_PARAM_H empty. # When in doubt, leave HAVE_SYS_PARAM_H empty.
# #
HAVE_SYS_PARAM_H= HAVE_SYS_PARAM_H=
@@ -529,8 +502,6 @@ HAVE_SYS_PARAM_H=
# HAVE_SYS_MOUNT_H= YES assume that the include file exists # HAVE_SYS_MOUNT_H= YES assume that the include file exists
# HAVE_SYS_MOUNT_H= NO assume that the include file does not exist # HAVE_SYS_MOUNT_H= NO assume that the include file does not exist
# #
# Select HAVE_SYS_MOUNT_H= NO for DJGPP.
#
# When in doubt, leave HAVE_SYS_MOUNT_H empty. # When in doubt, leave HAVE_SYS_MOUNT_H empty.
# #
HAVE_SYS_MOUNT_H= HAVE_SYS_MOUNT_H=
@@ -544,8 +515,6 @@ HAVE_SYS_MOUNT_H=
# -DHAVE_NO_GETSID, then calc will use internal functions to simulate # -DHAVE_NO_GETSID, then calc will use internal functions to simulate
# the getsid() function that gets session ID. # the getsid() function that gets session ID.
# #
# Select HAVE_GETSID= -DHAVE_NO_GETSID for DJGPP.
#
# If in doubt, leave HAVE_GETSID empty and this Makefile will figure it out. # If in doubt, leave HAVE_GETSID empty and this Makefile will figure it out.
# #
HAVE_GETSID= HAVE_GETSID=
@@ -558,8 +527,6 @@ HAVE_GETSID=
# -DHAVE_NO_GETPGID, then calc will use internal functions to simulate # -DHAVE_NO_GETPGID, then calc will use internal functions to simulate
# the getpgid() function that sets the process group ID. # the getpgid() function that sets the process group ID.
# #
# Select HAVE_GETPGID= -DHAVE_NO_GETPGID for DJGPP.
#
# If in doubt, leave HAVE_GETPGID empty and this Makefile will figure it out. # If in doubt, leave HAVE_GETPGID empty and this Makefile will figure it out.
# #
HAVE_GETPGID= HAVE_GETPGID=
@@ -572,8 +539,6 @@ HAVE_GETPGID=
# -DHAVE_NO_GETTIME, then calc will use internal functions to simulate # -DHAVE_NO_GETTIME, then calc will use internal functions to simulate
# the clock_gettime() function. # the clock_gettime() function.
# #
# Select HAVE_GETTIME= -DHAVE_NO_GETTIME for DJGPP.
#
# If in doubt, leave HAVE_GETTIME empty and this Makefile will figure it out. # If in doubt, leave HAVE_GETTIME empty and this Makefile will figure it out.
# #
HAVE_GETTIME= HAVE_GETTIME=
@@ -586,8 +551,6 @@ HAVE_GETTIME=
# -DHAVE_NO_GETPRID, then calc will use internal functions to simulate # -DHAVE_NO_GETPRID, then calc will use internal functions to simulate
# the getprid() function. # the getprid() function.
# #
# Select HAVE_GETPRID= -DHAVE_NO_GETPRID for DJGPP.
#
# If in doubt, leave HAVE_GETPRID empty and this Makefile will figure it out. # If in doubt, leave HAVE_GETPRID empty and this Makefile will figure it out.
# #
HAVE_GETPRID= HAVE_GETPRID=
@@ -599,8 +562,6 @@ HAVE_GETPRID=
# HAVE_URANDOM_H= YES assume that /dev/urandom exists # HAVE_URANDOM_H= YES assume that /dev/urandom exists
# HAVE_URANDOM_H= NO assume that /dev/urandom does not exist # HAVE_URANDOM_H= NO assume that /dev/urandom does not exist
# #
# Select HAVE_URANDOM_H= NO for DJGPP.
#
# When in doubt, leave HAVE_URANDOM_H empty. # When in doubt, leave HAVE_URANDOM_H empty.
# #
HAVE_URANDOM_H= HAVE_URANDOM_H=
@@ -642,8 +603,6 @@ HAVE_STRDUP=
# ALIGN32= -DMUST_ALIGN32 force 32 bit alignment # ALIGN32= -DMUST_ALIGN32 force 32 bit alignment
# ALIGN32= -UMUST_ALIGN32 allow non-alignment of 32 bit accesses # ALIGN32= -UMUST_ALIGN32 allow non-alignment of 32 bit accesses
# #
# Select ALIGN32= -UMUST_ALIGN32 for DJGPP.
#
# When in doubt, be safe and pick ALIGN32=-DMUST_ALIGN32. # When in doubt, be safe and pick ALIGN32=-DMUST_ALIGN32.
# #
ALIGN32= ALIGN32=
@@ -656,8 +615,6 @@ ALIGN32=
# HAVE_STDLIB_H= YES assume that the include file exists # HAVE_STDLIB_H= YES assume that the include file exists
# HAVE_STDLIB_H= NO assume that the include file does not exist # HAVE_STDLIB_H= NO assume that the include file does not exist
# #
# Select HAVE_STDLIB_H= YES for DJGPP.
#
# When in doubt, leave HAVE_STDLIB_H empty. # When in doubt, leave HAVE_STDLIB_H empty.
# #
HAVE_STDLIB_H= HAVE_STDLIB_H=
@@ -670,8 +627,6 @@ HAVE_STDLIB_H=
# HAVE_STRING_H= YES assume that the include file exists # HAVE_STRING_H= YES assume that the include file exists
# HAVE_STRING_H= NO assume that the include file does not exist # HAVE_STRING_H= NO assume that the include file does not exist
# #
# Select HAVE_STRING_H= YES for DJGPP.
#
# When in doubt, leave HAVE_STRING_H empty. # When in doubt, leave HAVE_STRING_H empty.
# #
HAVE_STRING_H= HAVE_STRING_H=
@@ -684,8 +639,6 @@ HAVE_STRING_H=
# HAVE_TIMES_H= YES assume that the include file exists # HAVE_TIMES_H= YES assume that the include file exists
# HAVE_TIMES_H= NO assume that the include file does not exist # HAVE_TIMES_H= NO assume that the include file does not exist
# #
# Select HAVE_TIMES_H= NO for DJGPP.
#
# When in doubt, leave HAVE_TIMES_H empty. # When in doubt, leave HAVE_TIMES_H empty.
# #
HAVE_TIMES_H= HAVE_TIMES_H=
@@ -698,8 +651,6 @@ HAVE_TIMES_H=
# HAVE_SYS_TIMES_H= YES assume that the include file exists # HAVE_SYS_TIMES_H= YES assume that the include file exists
# HAVE_SYS_TIMES_H= NO assume that the include file does not exist # HAVE_SYS_TIMES_H= NO assume that the include file does not exist
# #
# Select HAVE_SYS_TIMES_H= YES for DJGPP.
#
# When in doubt, leave HAVE_SYS_TIMES_H empty. # When in doubt, leave HAVE_SYS_TIMES_H empty.
# #
HAVE_SYS_TIMES_H= HAVE_SYS_TIMES_H=
@@ -712,8 +663,6 @@ HAVE_SYS_TIMES_H=
# HAVE_TIME_H= YES assume that the include file exists # HAVE_TIME_H= YES assume that the include file exists
# HAVE_TIME_H= NO assume that the include file does not exist # HAVE_TIME_H= NO assume that the include file does not exist
# #
# Select HAVE_TIME_H= YES for DJGPP.
#
# When in doubt, leave HAVE_TIME_H empty. # When in doubt, leave HAVE_TIME_H empty.
# #
HAVE_TIME_H= HAVE_TIME_H=
@@ -726,8 +675,6 @@ HAVE_TIME_H=
# HAVE_SYS_TIME_H= YES assume that the include file exists # HAVE_SYS_TIME_H= YES assume that the include file exists
# HAVE_SYS_TIME_H= NO assume that the include file does not exist # HAVE_SYS_TIME_H= NO assume that the include file does not exist
# #
# Select HAVE_SYS_TIME_H= YES for DJGPP.
#
# When in doubt, leave HAVE_SYS_TIME_H empty. # When in doubt, leave HAVE_SYS_TIME_H empty.
# #
HAVE_SYS_TIME_H= HAVE_SYS_TIME_H=
@@ -740,8 +687,6 @@ HAVE_SYS_TIME_H=
# HAVE_UNISTD_H= YES assume that the include file exists # HAVE_UNISTD_H= YES assume that the include file exists
# HAVE_UNISTD_H= NO assume that the include file does not exist # HAVE_UNISTD_H= NO assume that the include file does not exist
# #
# Select HAVE_UNISTD_H= YES for DJGPP.
#
# When in doubt, leave HAVE_UNISTD_H empty. # When in doubt, leave HAVE_UNISTD_H empty.
# #
HAVE_UNISTD_H= HAVE_UNISTD_H=
@@ -754,8 +699,6 @@ HAVE_UNISTD_H=
# HAVE_LIMITS_H= YES assume that the include file exists # HAVE_LIMITS_H= YES assume that the include file exists
# HAVE_LIMITS_H= NO assume that the include file does not exist # HAVE_LIMITS_H= NO assume that the include file does not exist
# #
# Select HAVE_LIMITS_H= YES for DJGPP.
#
# When in doubt, leave HAVE_LIMITS_H empty. # When in doubt, leave HAVE_LIMITS_H empty.
# #
HAVE_LIMITS_H= HAVE_LIMITS_H=
@@ -768,8 +711,6 @@ HAVE_LIMITS_H=
# to determine if the unused attribute is supported. If HAVE_UNUSED is set to # to determine if the unused attribute is supported. If HAVE_UNUSED is set to
# -DHAVE_NO_UNUSED, then the unused attribute will not be used. # -DHAVE_NO_UNUSED, then the unused attribute will not be used.
# #
# Select HAVE_UNUSED= for DJGPP.
#
# If in doubt, leave HAVE_UNUSED empty and this Makefile will figure it out. # If in doubt, leave HAVE_UNUSED empty and this Makefile will figure it out.
# #
HAVE_UNUSED= HAVE_UNUSED=
@@ -817,10 +758,6 @@ HAVE_STRLCAT=
# #
# ${INCDIR} where the system include (.h) files are kept # ${INCDIR} where the system include (.h) files are kept
# #
# For DJGPP, select:
#
# INCDIR= /dev/env/DJDIR/include
#
# If in doubt, for non-macOS hosts set: # If in doubt, for non-macOS hosts set:
# #
# INCDIR= /usr/include # INCDIR= /usr/include
@@ -828,6 +765,7 @@ HAVE_STRLCAT=
# However, if you are on macOS then set: # However, if you are on macOS then set:
# #
# INCDIR= ${PREFIX}/include # INCDIR= ${PREFIX}/include
#
ifeq ($(target),Darwin) ifeq ($(target),Darwin)
# determine default INCDIR for macOS # determine default INCDIR for macOS
@@ -873,12 +811,6 @@ endif # ($(target),Darwin)
# #
# You might be better off not changing LIBDIR in the first place. # You might be better off not changing LIBDIR in the first place.
# #
# For DJGPP, select:
#
# BINDIR= /dev/env/DJDIR/bin
# LIBDIR= /dev/env/DJDIR/lib
# CALC_SHAREDIR= /dev/env/DJDIR/share/calc
#
# If in doubt, for non-macOS hosts set: # If in doubt, for non-macOS hosts set:
# #
# BINDIR= /usr/bin # BINDIR= /usr/bin
@@ -996,8 +928,6 @@ T=
# where man section 1 pages are installed # where man section 1 pages are installed
# #
# Select MANDIR= /dev/env/DJDIR/man/man1 for DJGPP.
#
# Use MANDIR= to disable installation of the calc man (source) page. # Use MANDIR= to disable installation of the calc man (source) page.
# #
# NOTE: man pages not installed by macOS must go under, # NOTE: man pages not installed by macOS must go under,
@@ -1020,8 +950,6 @@ endif # ($(target),Darwin)
# where cat (formatted man) pages are installed # where cat (formatted man) pages are installed
# #
# Select CATDIR= /dev/env/DJDIR/man/cat1 for DJGPP.
#
# Use CATDIR= to disable installation of the calc cat (formatted) page. # Use CATDIR= to disable installation of the calc cat (formatted) page.
# #
# NOTE: If CATDIR is non-empty, then one should have either the # NOTE: If CATDIR is non-empty, then one should have either the
@@ -1070,8 +998,6 @@ CATEXT= 1
# #
# The cat page is not built or installed # The cat page is not built or installed
# #
# Select NROFF= groff for DJGPP.
#
# If in doubt and you don't want to fool with man pages, set MANDIR # If in doubt and you don't want to fool with man pages, set MANDIR
# and CATDIR to empty and ignore the NROFF, NROFF_ARG and MANMAKE # and CATDIR to empty and ignore the NROFF, NROFF_ARG and MANMAKE
# lines below. # lines below.
@@ -1102,8 +1028,6 @@ ALLOW_CUSTOM= -DCUSTOM
# If the $CALCPATH environment variable is not defined, then the following # If the $CALCPATH environment variable is not defined, then the following
# path will be searched for calc resource file routines. # path will be searched for calc resource file routines.
# #
# Select CALCPATH= .;./cal;~/.cal;${CALC_SHAREDIR};${CUSTOMCALDIR} for DJGPP.
#
ifeq ($(ALLOW_CUSTOM),-DCUSTOM) ifeq ($(ALLOW_CUSTOM),-DCUSTOM)
CALCPATH= .:./cal:~/.cal:${T}${CALC_SHAREDIR}:${T}${CUSTOMCALDIR} CALCPATH= .:./cal:~/.cal:${T}${CALC_SHAREDIR}:${T}${CUSTOMCALDIR}
else # ($(ALLOW_CUSTOM),-DCUSTOM) else # ($(ALLOW_CUSTOM),-DCUSTOM)
@@ -1123,8 +1047,6 @@ endif # RPM_TOP
# If the $CALCRC environment variable is not defined, then the following # If the $CALCRC environment variable is not defined, then the following
# path will be searched for calc resource files. # path will be searched for calc resource files.
# #
# Select CALCRC= ./.calcinit:~/.calcrc:${CALC_SHAREDIR}/startup for DJGPP.
#
CALCRC= ./.calcinit:~/.calcrc:${CALC_SHAREDIR}/startup CALCRC= ./.calcinit:~/.calcrc:${CALC_SHAREDIR}/startup
#CALCRC= ./.calcinit;~/.calcrc;${CALC_SHAREDIR}/startup #CALCRC= ./.calcinit;~/.calcrc;${CALC_SHAREDIR}/startup
@@ -1207,8 +1129,6 @@ endif # ($(HOMEBREW_PREFIX),)
# If $PAGER is not set, use this program to display a help file # If $PAGER is not set, use this program to display a help file
# #
# Select CALCPAGER= less.exe -ci for DJGPP.
#
#CALCPAGER= more #CALCPAGER= more
#CALCPAGER= pg #CALCPAGER= pg
#CALCPAGER= cat #CALCPAGER= cat
@@ -1217,8 +1137,6 @@ CALCPAGER= less
# Debug/Optimize options for ${CC} and ${LCC} # Debug/Optimize options for ${CC} and ${LCC}
# #
# Select DEBUG= -O2 -gstabs+ -DWINDOZ for DJGPP.
#
#DEBUG= #DEBUG=
#DEBUG= -g #DEBUG= -g
#DEBUG= -g3 #DEBUG= -g3

View File

@@ -40,6 +40,27 @@ NOTE: Compiling calc under Windows 11 is work in progress. If you run into
problems, consider the "Compiling with Cygwin" section below. problems, consider the "Compiling with Cygwin" section below.
=-=-=-=-=-=-=-=-=-=-=-=-=-=
=-= Compiling with Msys =-=
=-=-=-=-=-=-=-=-=-=-=-=-=-=
The MSYS2 Software Distribution and Building Platform for Windows:
https://www.msys2.org
is a fork of Cygwin. In `Makefile.config`, when the OSNAME is "Msys",
the Cygwin target it set. MSYS2 Software Distribution users should be
sure that the following command prints "Msys".
uname -o
Or call make with OSNAME set as in:
make ... OSNAME=Msys
Follow the "Compiling with Cygwin" instructions below.
=-=-=-=-=-=-=-=-=-=-=-=-=-=-= =-=-=-=-=-=-=-=-=-=-=-=-=-=-=
=-= Compiling with Cygwin =-= =-= Compiling with Cygwin =-=
=-=-=-=-=-=-=-=-=-=-=-=-=-=-= =-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -107,97 +128,6 @@ compilation steps that GitHub user @Leoongithub recommends:
of calc, installing calc may be of benefit so you can use calc elsewhere on your system. of calc, installing calc may be of benefit so you can use calc elsewhere on your system.
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
=-= If all else fails, for Cygwin =-=
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
Much earlier (2001?) Thomas Jones-Low (tjoneslo at softstart dot com)
recommended that you generate by hand all of the header files that
by the Makefile. This has been done for you via the makefile rule:
make win32_hsrc
which uses the Makefile variables in win32.mkdef to form these header
files under win32 directory.
You will find generated versions of these files located in the win32
sub-directory. These files may be appropriate for your Cygwin building
needs.
In particular:
Just copy the win32/*.[ch] files up into the top level calc
source directory, edit them (if needed) and build using the
Cygwin GCC compiler and Cygwin build environment.
NOTE: The use of win32_hsrc and this method has been deprecated.
It may go away once the Windows 11 methods are stable.
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
=-= compiling under DJGPP =-=
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
You might want to try using the DJGPP system to compile calc. See:
http://www.delorie.com/djgpp/
for DJGPP details and availability.
To compile with DJGPP, one needs to select a number of Makefile
variable changes. Eli Zaretskii <eliz at is dot elta dot co dot il>
recommends the following settings:
TERMCONTROL= -DUSE_TERMIOS
BYTE_ORDER= -DLITTLE_ENDIAN
LONG_BITS= 32
HAVE_FPOS_POS= -DHAVE_NO_FPOS_POS
FPOS_BITS= 32
OFF_T_BITS= 32
DEV_BITS= 32
INODE_BITS= 32
HAVE_USTAT= -DHAVE_NO_USTAT
HAVE_GETSID= -DHAVE_NO_GETSID
HAVE_GETPGID= -DHAVE_NO_GETPGID
HAVE_GETTIME= -DHAVE_NO_GETTIME
HAVE_GETPRID= -DHAVE_NO_GETPRID
HAVE_URANDOM_H= NO
ALIGN32= -UMUST_ALIGN32
HAVE_MALLOC_H= YES
HAVE_STDLIB_H= YES
HAVE_STRING_H= YES
HAVE_TIMES_H= NO
HAVE_SYS_TIMES_H= YES
HAVE_TIME_H= YES
HAVE_SYS_TIME_H= YES
HAVE_UNISTD_H= YES
BINDIR= /dev/env/DJDIR/bin
INCDIR= /dev/env/DJDIR/include
LIBDIR= /dev/env/DJDIR/lib
MANDIR= /dev/env/DJDIR/man/man1
CATDIR= /dev/env/DJDIR/man/cat1
NROFF= groff
CALCPATH= .;./cal;~/.cal;${CALC_SHAREDIR};${CUSTOMCALDIR}
CALCRC= ./.calcinit;~/.calcrc;${CALC_SHAREDIR}/startup
CALCPAGER= less.exe -ci
DEBUG= -O2 -gstabs+ -D_WIN32
HAVE_ENVIRON=-DHAVE_NO_ENVIRON
HAVE_ARC4RANDOM=-DHAVE_NO_ARC4RANDOM
The 'Linux set' or 'gcc set' (see the Select your compiler type section)
should work for DJGPP systems if you set the above Makefile variables.
Look for Makefile comments of the form:
# Select ...something... for DJGPP.
Follow those recommendations. In cases where they conflict with
the above Makefile list, follow the recommendation in the Makefile.
NOTE: The use of DJGPP and this method has been deprecated.
It may go away once the Windows 11 methods are stable.
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
=-= Compiling calc via virtual machine under Windows 11 =-= =-= Compiling calc via virtual machine under Windows 11 =-=
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -230,7 +160,7 @@ NOTE: The use of calc under Windows 10 has been deprecated in favor of one
of the Windows 11 methods above. of the Windows 11 methods above.
## Copyright (C) 2002-2009,2021,2022 Landon Curt Noll and Thomas Jones-Low ## Copyright (C) 2002-2009,2021-2023 Landon Curt Noll and Thomas Jones-Low
## ##
## Calc is open software; you can redistribute it and/or modify it under ## Calc is open software; you can redistribute it and/or modify it under
## the terms of the version 2.1 of the GNU Lesser General Public License ## the terms of the version 2.1 of the GNU Lesser General Public License

View File

@@ -1,67 +0,0 @@
TERMCONTROL=-DUSE_WIN32
HAVE_VSNPRINTF=-UDONT_HAVE_VSNPRINTF
BYTE_ORDER=-DLITTLE_ENDIAN
CALC_CHARBIT=8
LONG_BITS=32
HAVE_FPOS=-DHAVE_NO_FPOS
HAVE_FPOS_POS=-DHAVE_NO_FPOS_POS
FPOS_POS_BITS=-UFPOS_POS_BITS
FPOS_BITS=-DFPOS_BITS=64
OFF_T_BITS=-DOFF_T_BITS=32
DEV_BITS=-DDEV_BITS=32
INODE_BITS=-DINODE_BITS=16
HAVE_OFFSCL=-UOFF_T_NON_SCALAR
HAVE_POSSCL=-UFILEPOS_NON_SCALAR
HAVE_CONST=-UHAVE_NO_CONST
HAVE_UID_T=-DHAVE_NO_UID_T
HAVE_NEWSTR=-UHAVE_NO_NEWSTR
HAVE_MEMMOVE=-UHAVE_NO_MEMMOVE
HAVE_USTAT=-DHAVE_NO_USTAT
HAVE_GETSID=-DHAVE_NO_GETSID
HAVE_GETPGID=-DHAVE_NO_GETPGID
HAVE_GETTIME=-DHAVE_NO_GETTIME
HAVE_GETPRID=-DHAVE_NO_GETPRID
HAVE_URANDOM_H=NO
HAVE_GETRUSAGE=-DHAVE_NO_GETRUSAGE
HAVE_STRDUP=-UHAVE_NO_STRDUP
ALIGN32=-DMUST_ALIGN32
HAVE_MALLOC_H=YES
HAVE_STDLIB_H=YES
HAVE_STRING_H=YES
HAVE_TIMES_H=NO
HAVE_SYS_TIMES_H=NO
HAVE_TIME_H=YES
HAVE_SYS_TIME_H=NO
HAVE_UNISTD_H=NO
HAVE_LIMITS_H=YES
HAVE_ENVIRON=-DHAVE_NO_ENVIRON
HAVE_ARC4RANDOM=-DHAVE_NO_ARC4RANDOM
HAVE_SYS_VFS_H=NO
HAVE_SYS_PARAM_H=NO
HAVE_SYS_MOUNT_H=NO
BINDIR=/usr/bin/calc
LIBDIR=/lib/calc
HELPDIR=/lib/calc/help
CALC_INCDIR=/include/calc
CUSTOMCALDIR=/lib/calc/custom
CUSTOMHELPDIR=/lib/calc/help/custhelp
SCRIPTDIR=/lib/calc/cscript
MANDIR=/usr/man/man1
CATDIR=/usr/man/cat1
MANEXT=1
CATEXT=1
NROFF=nroff
NROFF_ARG=
MANMAKE=
MANMODE=
CALCPATH=./cal
CALCRC='./.calcinit:~/.calcrc:/lib/calc/startup'
USE_READLINE=-DUSE_READLINE
READLINE_LIB=
READLINE_INCLUDE=
CALCPAGER=less.exe
CCBAN=-DUNBAN
EXT=.exe