Skip to content

Commit f48f47c

Browse files
author
jan.nijtmans
committed
Rebase to 9.0
2 parents 229e7db + 6b8f36c commit f48f47c

File tree

4 files changed

+32
-21
lines changed

4 files changed

+32
-21
lines changed

.github/workflows/msys2-build.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: msys2
2+
3+
on:
4+
push:
5+
6+
jobs:
7+
msys2:
8+
runs-on: windows-latest
9+
10+
defaults:
11+
run:
12+
shell: msys2 {0}
13+
working-directory: unix
14+
15+
steps:
16+
- name: Init MSYS
17+
uses: msys2/setup-msys2@v2
18+
with:
19+
msystem: MSYS
20+
install: git base-devel msys2-devel zlib
21+
update: true
22+
- name: Checkout
23+
uses: actions/checkout@v4
24+
- name: Build
25+
run: |
26+
./configure -C --prefix=/usr --enable-64bit || { cat config.log; cat config.cache; exit 1; }
27+
make
28+
- name: Run Tests (ignoring test io-53.4.1 which hangs)
29+
run: make test
30+
env:
31+
ERROR_ON_FAILURES: 1
32+
TESTFLAGS: -skip io-53.4.1

unix/Makefile.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -812,9 +812,6 @@ ${LIB_FILE}: ${STUB_LIB_FILE} ${OBJS} ${TCL_ZIP_FILE}
812812
fi
813813

814814
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
815-
@if [ "x${LIB_FILE}" = "xcygtcl${MAJOR_VERSION}.${MINOR_VERSION}.dll" ] ; then \
816-
( cd ${TOP_DIR}/win; ${MAKE} winextensions ); \
817-
fi
818815
rm -f $@
819816
@MAKE_STUB_LIB@
820817

unix/configure

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5996,15 +5996,6 @@ printf "%s\n" "$ac_cv_cygwin" >&6; }
59965996
as_fn_error $? "${CC} is not a cygwin compiler." "$LINENO" 5
59975997
fi
59985998
do64bit_ok=yes
5999-
if test "x${SHARED_BUILD}" = "x1"; then
6000-
echo "running cd ../win; ${CONFIG_SHELL-/bin/sh} ./configure $ac_configure_args --enable-64bit --host=x86_64-w64-mingw32"
6001-
# The eval makes quoting arguments work.
6002-
if cd ../win; eval ${CONFIG_SHELL-/bin/sh} ./configure $ac_configure_args --enable-64bit --host=x86_64-w64-mingw32; cd ../unix
6003-
then :
6004-
else
6005-
{ echo "configure: error: configure failed for ../win" 1>&2; exit 1; }
6006-
fi
6007-
fi
60085999
;;
60096000
dgux*)
60106001
SHLIB_CFLAGS="-K PIC"

unix/tcl.m4

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1101,15 +1101,6 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
11011101
AC_MSG_ERROR([${CC} is not a cygwin compiler.])
11021102
fi
11031103
do64bit_ok=yes
1104-
if test "x${SHARED_BUILD}" = "x1"; then
1105-
echo "running cd ../win; ${CONFIG_SHELL-/bin/sh} ./configure $ac_configure_args --enable-64bit --host=x86_64-w64-mingw32"
1106-
# The eval makes quoting arguments work.
1107-
if cd ../win; eval ${CONFIG_SHELL-/bin/sh} ./configure $ac_configure_args --enable-64bit --host=x86_64-w64-mingw32; cd ../unix
1108-
then :
1109-
else
1110-
{ echo "configure: error: configure failed for ../win" 1>&2; exit 1; }
1111-
fi
1112-
fi
11131104
;;
11141105
dgux*)
11151106
SHLIB_CFLAGS="-K PIC"

0 commit comments

Comments
 (0)