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

Replace libreadline with libedit on all platforms #377

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Replace libreadline with libedit on all platforms #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2cd724
Use libedit on all platforms
olebole Feb 23, 2024
6d7cac9
Document using libedit instead of libreadline on Linux
olebole Feb 23, 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/citest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ jobs:
if [ ${LDFLAGS} == '-m32' ] ; then
sudo dpkg --add-architecture i386
sudo apt-get update -y
sudo apt-get install -y gcc-multilib libcurl4-openssl-dev:i386 libexpat1-dev:i386 libreadline-dev:i386 zlib1g-dev:i386
sudo apt-get install -y gcc-multilib libcurl4-openssl-dev:i386 libexpat1-dev:i386 libedit-dev:i386 zlib1g-dev:i386
else
sudo apt-get update -y
sudo apt-get install -y build-essential libcurl4-openssl-dev libexpat1-dev libreadline-dev zlib1g-dev
sudo apt-get install -y build-essential libcurl4-openssl-dev libexpat1-dev libedit-dev zlib1g-dev
fi

- name: Build IRAF
Expand Down
7 changes: 3 additions & 4 deletions INSTALL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,15 @@

## System Requirements and Dependencies

The distributed binaries require the readline or libedit, and zlib
libraries to be installed.
The distributed binaries require the libedit and zlib libraries to be installed.

On Debian and its derivatives (Ubuntu, Mint, Devuan, Raspbian etc.):

$ sudo apt install gcc make bison flex zlib1g-dev libreadline-dev
$ sudo apt install gcc make bison flex zlib1g-dev libedit-dev

On Fedora and its derivatives (Redhat, Scientific Linux etc.)

$ sudo dnf install gcc make perl flex bison zlib-devel readline-devel
$ sudo dnf install gcc make perl flex bison zlib-devel libedit-devel

On macOS, you need to have the XCode tools installed. If you
haven't, you can install them with:
Expand Down
9 changes: 2 additions & 7 deletions pkg/ecl/mkpkg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,8 @@ relink:
<libc/iraf_stdio.h> config.h construct.h errs.h\
grammar.h mem.h opcodes.h operand.h param.h task.h
link:
$set LIBS = "-lc -lcur -lds -lstg"
$ifeq (MACH, macosx, macintel, macos64) then
$set LIBS2 = "-ledit"
$else
$set LIBS2 = "-lreadline"
$endif
$link ecl.o globals.o opcodes.o libpkg.a $(LIBS) $(LIBS2)
$set LIBS = "-lc -lcur -lds -lstg -ledit"
$link ecl.o globals.o opcodes.o libpkg.a $(LIBS)
;

install:
Expand Down