Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix tests #56

Merged
merged 9 commits into from
Aug 13, 2024
Merged

Fix tests #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1698883
update to gcc 11
bovine Aug 13, 2024
255bf78
update mac ci for modern brew
bovine Aug 13, 2024
ee40781
update autoconf stuff
bovine Aug 13, 2024
cd8c47f
add libtool
bovine Aug 13, 2024
25746d5
mac calls it glibtoolize due to name conflict
bovine Aug 13, 2024
000d675
fix readline path
bovine Aug 13, 2024
f8268e4
whitespace
bovine Aug 13, 2024
1d73e2d
fix readline paths
bovine Aug 13, 2024
ed62c4d
remove debugging
bovine Aug 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/linux-ci.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading