Skip to content

Commit

Permalink
Fix tests (#56)
Browse files Browse the repository at this point in the history
* update to gcc 11
* update mac ci for modern brew
* update autoconf stuff
* add libtool
  • Loading branch information
bovine authored Aug 13, 2024
1 parent 9915a12 commit 20f1425
Show file tree
Hide file tree
Showing 7 changed files with 2,194 additions and 19,424 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/linux-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ jobs:
run: |
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
sudo apt-get update -qq
sudo apt-get install -y gcc-7 g++-7
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 70 --slave /usr/bin/g++ g++ /usr/bin/g++-7
sudo apt-get install -y gcc-11 g++-11
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 70 --slave /usr/bin/g++ g++ /usr/bin/g++-11
sudo apt-get install -y tcl8.6-dev tk8.6-dev libreadline-dev expect
- name: configure
run: |
Expand Down
13 changes: 3 additions & 10 deletions .github/workflows/mac-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,12 @@ jobs:
- name: Install dependencies
run: |
brew update
brew install tcl-tk || brew upgrade tcl-tk
brew install readline || brew upgrade readline
brew install autoconf || brew upgrade autoconf
brew install automake || brew upgrade automake
sudo mkdir -p /usr/local
sudo ln -sf /usr/local/opt/tcl-tk/include /usr/local/include/tcl8.6
sudo cp /usr/local/opt/tcl-tk/lib/libtcl* /usr/local/lib
sudo ln -sf /usr/local/opt/tcl-tk/bin/tclsh8.6 /usr/local/bin/tclsh
sudo ln -sf /usr/local/opt/tcl-tk/bin/tclsh8.6 /usr/local/bin/tclsh8.6
brew install tcl-tk readline autoconf automake libtool
- name: configure
run: |
glibtoolize
autoreconf -vif
./configure --with-readline-includes=/usr/local/Cellar/readline/8.1/include --with-readline-library=/usr/local/Cellar/readline/8.1/lib --with-tcl=/usr/local/opt/tcl-tk/lib --with-tcl-includes=/usr/local/opt/tcl-tk/include
./configure --with-readline-includes=/opt/homebrew/opt/readline/include --with-readline-library=/opt/homebrew/opt/readline/lib --with-tcl=/opt/homebrew/opt/tcl-tk/lib --with-tcl-includes=/opt/homebrew/opt/tcl-tk/include
- name: make
run: make
- name: install
Expand Down
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ lib_LTLIBRARIES = libtclreadline.la
libtclreadline_la_SOURCES = config.h tclreadline.c tclreadline.h
include_HEADERS = tclreadline.h

INCLUDES = -I$(TCL_INCLUDE_DIR) -I$(READLINE_INCLUDE_DIR)
AM_CPPFLAGS = -I$(TCL_INCLUDE_DIR) -I$(READLINE_INCLUDE_DIR)

if !USE_TCL_STUBS
libtclreadline_la_CFLAGS = -Wall
Expand Down
Loading

0 comments on commit 20f1425

Please sign in to comment.