Skip to content

Commit

Permalink
ok I think I figured out the itcl failure
Browse files Browse the repository at this point in the history
(hopefully...?)

Change-Id: Ie8738b3c8a09d644db496880b45e1bdc4a993b9b
  • Loading branch information
cooljeanius committed Jan 10, 2024
1 parent d896d1f commit 4fb5592
Show file tree
Hide file tree
Showing 7 changed files with 64 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/apple-gdb-1824-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ jobs:
- run: cd src && make all-libdecnumber
- run: cd src && make all-mmalloc
- run: cd src && make configure-readline
- run: cd src && for dir in libtool_gnu sim utils tcl expect dejagnu itcl tk libgui; do if test -e ${dir}/configure; then (echo "configuring in ${dir}" && make configure-${dir}); elif test -d ${dir}; then ls ${dir}/configure*; else echo "skipping configuring in ${dir}"; fi; done
- run: cd src && for dir in libtool_gnu sim utils tcl expect dejagnu itcl tk libgui; do if test -e ${dir}/configure; then (echo "configuring in ${dir}" && make configure-${dir} && ls ${dir}/config*); elif test -d ${dir}; then ls ${dir}/configure*; else echo "skipping configuring in ${dir}"; fi; done
- run: cd src && for dir in sim utils tcl expect dejagnu itcl tk libgui; do if test -e ${dir}/Makefile; then (echo "building in ${dir}" && make -C ${dir}); elif test -d ${dir}; then ls ${dir}/Makefile*; else echo "skipping ${dir}"; fi; done
- run: cd src && make configure-gdb
- run: cd src && make all-gdb
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/apple-gdb-1824.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- run: cd src && make all-libdecnumber
- run: cd src && make all-mmalloc
- run: cd src && make configure-readline
- run: cd src && for dir in libtool_gnu sim utils tcl expect dejagnu itcl tk libgui; do if test -e ${dir}/configure; then (echo "configuring in ${dir}" && make configure-${dir}); elif test -d ${dir}; then ls ${dir}/configure*; else echo "skipping configuring in ${dir}"; fi; done
- run: cd src && for dir in libtool_gnu sim utils tcl expect dejagnu itcl tk libgui; do if test -e ${dir}/configure; then (echo "configuring in ${dir}" && make configure-${dir} && echo "done configuring in ${dir}"); elif test -d ${dir}; then ls ${dir}/configure*; else echo "skipping configuring in ${dir}"; fi; done
- run: cd src && for dir in sim utils tcl expect dejagnu itcl tk libgui; do if test -e ${dir}/Makefile; then (echo "building in ${dir}" && make -C ${dir}); elif test -d ${dir}; then ls ${dir}/Makefile*; else echo "skipping ${dir}"; fi; done
- run: cd src && make check-libiberty
- run: cd src && sync && make -C tcl/unix tcltest && sync
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ jobs:
make configure-readline
for dir in libtool_gnu sim utils tcl expect dejagnu itcl tk libgui; do \
if test -e ${dir}/configure; then \
make configure-${dir}; \
make configure-${dir} || (if test -e ${dir}/config.cache; then cat ${dir}/config.cache >&2 && exit 1; fi); \
elif test -d ${dir}; then \
ls ${dir}/configure*; \
else \
Expand All @@ -220,6 +220,9 @@ jobs:
fi; \
done
- run: find . -name config.log -print0 | xargs -0 cat | grep -i error | sort | uniq
if: "${{ failure() }}"

- name: Extra coverage build (C)
if: matrix.language == 'c-cpp' && success()
run: |
Expand Down
34 changes: 25 additions & 9 deletions src/itcl/itcl/configure
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.72 for itcl 3.2.1.
#
# Report bugs to <[email protected]>.
#
#
# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation,
# Inc.
Expand Down Expand Up @@ -267,10 +269,11 @@ then :
printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should"
printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
else
printf "%s\n" "$0: Please tell [email protected] about your system,
$0: including any error possibly output before this
$0: message. Then install a modern shell, or manually run
$0: the script under such a shell if you do have one."
printf "%s\n" "$0: Please tell [email protected] and [email protected]
$0: about your system, including any error possibly output
$0: before this message. Then install a modern shell, or
$0: manually run the script under such a shell if you do
$0: have one."
fi
exit 1
fi ;;
Expand Down Expand Up @@ -602,7 +605,7 @@ PACKAGE_NAME='itcl'
PACKAGE_TARNAME='itcl'
PACKAGE_VERSION='3.2.1'
PACKAGE_STRING='itcl 3.2.1'
PACKAGE_BUGREPORT=''
PACKAGE_BUGREPORT='[email protected]'
PACKAGE_URL=''

ac_unique_file="generic/itcl.h"
Expand Down Expand Up @@ -1423,7 +1426,7 @@ Some influential environment variables:
Use these variables to override the choices made by 'configure' or to help
it to find libraries and programs with nonstandard names/locations.
Report bugs to the package provider.
Report bugs to <[email protected]>.
_ACEOF
ac_status=$?
fi
Expand Down Expand Up @@ -2572,9 +2575,22 @@ NODOT_VERSION=${MAJOR_VERSION}${MINOR_VERSION}
# encode the package version directly into the source files.
#--------------------------------------------------------------------

eval printf "%s\n" "#define VERSION \"${VERSION}\"" >>confdefs.h
if test -r confdefs.h && test -n "${VERSION}" && test -w /dev/stdout; then
if test "x${V}" != "x" && test "${V}" -ge 1; then
test -n "${V}" && test -s confdefs.h && cat confdefs.h && echo "${VERSION}"
fi
fi

eval
printf "%s\n" "#define VERSION \"${VERSION}\"" >>confdefs.h


if test -r confdefs.h && test -n "${VERSION}" && test -w /dev/stdout; then
if test "x${V}" != "x" && test "${V}" -ge 1; then
test -n "${V}" && test -s confdefs.h && cat confdefs.h && echo "${VERSION}"
fi
fi

#------------------------------------------------------------------------
# Handle the --prefix=... option
#------------------------------------------------------------------------
Expand All @@ -2595,7 +2611,7 @@ fi
#--------------------------------------------------------------------

# CYGNUS LOCAL

## just in case we need some extra debugging output:
if test "x${CC}" != "x"; then
test -n "${CC}" && echo "CC is currently set to '${CC}' for `pwd`"
fi
Expand Down Expand Up @@ -5984,7 +6000,7 @@ Usage: $0 [OPTION]... [TAG]...
Configuration files:
$config_files
Report bugs to the package provider."
Report bugs to <[email protected]>."
_ACEOF
ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
Expand Down
22 changes: 17 additions & 5 deletions src/itcl/itcl/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ sinclude(acinclude.m4)
# find the sources. The arguments to AC_INIT should be as found in the
# configure.scan generated by autoscan:
#
# AC_INIT([FULL-PACKAGE-NAME],[VERSION],[BUG-REPORT-ADDRESS])
# AC_CONFIG_SRCDIR([../generic/tcl.h])
dnl# AC_INIT([FULL-PACKAGE-NAME],[VERSION],[BUG-REPORT-ADDRESS])
dnl# AC_CONFIG_SRCDIR([../generic/tcl.h])
#--------------------------------------------------------------------

AC_PREREQ([2.61])
AC_INIT([itcl],[3.2.1],[])
AC_INIT([itcl],[3.2.1],[[email protected]])
AC_CONFIG_SRCDIR([generic/itcl.h])
# CYGNUS LOCAL
AC_CONFIG_AUX_DIR([../..])
Expand Down Expand Up @@ -50,7 +50,19 @@ AC_SUBST([VERSION])dnl
# encode the package version directly into the source files.
#--------------------------------------------------------------------

eval AC_DEFINE_UNQUOTED(VERSION, "${VERSION}")
if test -r confdefs.h && test -n "${VERSION}" && test -w /dev/stdout; then
if test "x${V}" != "x" && test "${V}" -ge 1; then
test -n "${V}" && test -s confdefs.h && cat confdefs.h && echo "${VERSION}"
fi
fi

eval AC_DEFINE_UNQUOTED([VERSION],["${VERSION}"],[Version])

if test -r confdefs.h && test -n "${VERSION}" && test -w /dev/stdout; then
if test "x${V}" != "x" && test "${V}" -ge 1; then
test -n "${V}" && test -s confdefs.h && cat confdefs.h && echo "${VERSION}"
fi
fi

#------------------------------------------------------------------------
# Handle the --prefix=... option
Expand All @@ -75,7 +87,7 @@ fi
m4_ifdef([SC_ENABLE_GCC],[
echo "using special GCC detection macro..."
SC_ENABLE_GCC
],[
],[ ## just in case we need some extra debugging output:
if test "x${CC}" != "x"; then
test -n "${CC}" && echo "CC is currently set to '${CC}' for `pwd`"
fi
Expand Down
20 changes: 12 additions & 8 deletions src/itcl/itk/configure
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.72 for itk 3.2.1.
#
# Report bugs to <[email protected]>.
#
#
# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation,
# Inc.
Expand Down Expand Up @@ -267,10 +269,11 @@ then :
printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should"
printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
else
printf "%s\n" "$0: Please tell [email protected] about your system,
$0: including any error possibly output before this
$0: message. Then install a modern shell, or manually run
$0: the script under such a shell if you do have one."
printf "%s\n" "$0: Please tell [email protected] and
$0: [email protected] about your system, including any
$0: error possibly output before this message. Then install
$0: a modern shell, or manually run the script under such a
$0: shell if you do have one."
fi
exit 1
fi ;;
Expand Down Expand Up @@ -602,7 +605,7 @@ PACKAGE_NAME='itk'
PACKAGE_TARNAME='itk'
PACKAGE_VERSION='3.2.1'
PACKAGE_STRING='itk 3.2.1'
PACKAGE_BUGREPORT=''
PACKAGE_BUGREPORT='[email protected]'
PACKAGE_URL=''

ac_unique_file="generic/itk.h"
Expand Down Expand Up @@ -1415,7 +1418,7 @@ Some influential environment variables:
Use these variables to override the choices made by 'configure' or to help
it to find libraries and programs with nonstandard names/locations.
Report bugs to the package provider.
Report bugs to <[email protected]>.
_ACEOF
ac_status=$?
fi
Expand Down Expand Up @@ -2396,7 +2399,8 @@ NODOT_VERSION=${MAJOR_VERSION}${MINOR_VERSION}
# encode the package version directly into the source files.
#--------------------------------------------------------------------

eval printf "%s\n" "#define VERSION \"${VERSION}\"" >>confdefs.h
eval
printf "%s\n" "#define VERSION \"${VERSION}\"" >>confdefs.h


#------------------------------------------------------------------------
Expand Down Expand Up @@ -5936,7 +5940,7 @@ Usage: $0 [OPTION]... [TAG]...
Configuration files:
$config_files
Report bugs to the package provider."
Report bugs to <[email protected]>."
_ACEOF
ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
Expand Down
8 changes: 4 additions & 4 deletions src/itcl/itk/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ sinclude(acinclude.m4)
# find the sources. The arguments to AC_INIT should be as found in the
# configure.scan generated by autoscan:
#
# AC_INIT([FULL-PACKAGE-NAME],[VERSION],[BUG-REPORT-ADDRESS])
# AC_CONFIG_SRCDIR([../generic/tcl.h])
dnl# AC_INIT([FULL-PACKAGE-NAME],[VERSION],[BUG-REPORT-ADDRESS])
dnl# AC_CONFIG_SRCDIR([../generic/tcl.h])
#--------------------------------------------------------------------

AC_PREREQ([2.61])
AC_INIT([itk],[3.2.1],[])
AC_INIT([itk],[3.2.1],[[email protected]])
AC_CONFIG_SRCDIR([generic/itk.h])
# CYGNUS LOCAL
AC_CONFIG_AUX_DIR([../..])
Expand Down Expand Up @@ -48,7 +48,7 @@ AC_SUBST([VERSION])dnl
# encode the package version directly into the source files.
#--------------------------------------------------------------------

eval AC_DEFINE_UNQUOTED(VERSION, "${VERSION}")
eval AC_DEFINE_UNQUOTED([VERSION],["${VERSION}"],[Version])

#------------------------------------------------------------------------
# Handle the --prefix=... option
Expand Down

0 comments on commit 4fb5592

Please sign in to comment.