* [gentoo-commits] repo/gentoo:master commit in: dev-lang/eisl/, dev-lang/eisl/files/
@ 2022-08-02 21:19 Maciej Barć
0 siblings, 0 replies; 4+ messages in thread
From: Maciej Barć @ 2022-08-02 21:19 UTC (permalink / raw
To: gentoo-commits
commit: a7f22f13b174fa12cf4ed87db73d9ce9a9b08b86
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 2 21:16:42 2022 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Tue Aug 2 21:18:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7f22f13
dev-lang/eisl: fix musl build - remove cdefs
Closes: https://bugs.gentoo.org/862963
Bug: https://github.com/sasagawa888/eisl/pull/186
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
dev-lang/eisl/eisl-2.50.ebuild | 5 ++++-
dev-lang/eisl/files/eisl-2.50-compat-no-cdefs.patch | 11 +++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/dev-lang/eisl/eisl-2.50.ebuild b/dev-lang/eisl/eisl-2.50.ebuild
index cad52bf1c3f0..d2ff0a7a86a7 100644
--- a/dev-lang/eisl/eisl-2.50.ebuild
+++ b/dev-lang/eisl/eisl-2.50.ebuild
@@ -20,7 +20,10 @@ DOCS=( README-ja.md README.md documents )
RDEPEND="sys-libs/ncurses:="
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}"/${P}-Makefile.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-Makefile.patch
+ "${FILESDIR}"/${P}-compat-no-cdefs.patch
+)
src_compile() {
emake CC="$(tc-getCC)" clean all
diff --git a/dev-lang/eisl/files/eisl-2.50-compat-no-cdefs.patch b/dev-lang/eisl/files/eisl-2.50-compat-no-cdefs.patch
new file mode 100644
index 000000000000..d4cb1f6f2bf4
--- /dev/null
+++ b/dev-lang/eisl/files/eisl-2.50-compat-no-cdefs.patch
@@ -0,0 +1,11 @@
+--- a/compat/cdefs.h
++++ b/compat/cdefs.h
+@@ -3,8 +3,6 @@
+ #ifndef COMPAT_CDEFS_H
+ #define COMPAT_CDEFS_H
+
+-#include <sys/cdefs.h>
+-
+ #ifndef __dead
+ #define __dead \
+ __attribute__((__noreturn__))
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/eisl/, dev-lang/eisl/files/
@ 2022-09-04 18:38 Maciej Barć
0 siblings, 0 replies; 4+ messages in thread
From: Maciej Barć @ 2022-09-04 18:38 UTC (permalink / raw
To: gentoo-commits
commit: 16a44777bafd458c69e5ed79c3168233a6f0bb16
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 4 18:35:51 2022 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sun Sep 4 18:38:15 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16a44777
dev-lang/eisl: bump to 2.62
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
dev-lang/eisl/Manifest | 1 +
dev-lang/eisl/eisl-2.62.ebuild | 40 ++++++++++++++++++++++++++++
dev-lang/eisl/files/eisl-2.62-Makefile.patch | 33 +++++++++++++++++++++++
3 files changed, 74 insertions(+)
diff --git a/dev-lang/eisl/Manifest b/dev-lang/eisl/Manifest
index 81b0575f9470..12f2843c8f60 100644
--- a/dev-lang/eisl/Manifest
+++ b/dev-lang/eisl/Manifest
@@ -1,2 +1,3 @@
DIST eisl-2.50.tar.gz 1757697 BLAKE2B 83c68213522320c815d9c7930c58181adba6f7fd3387421b7c7de55aca0fb6cabd78f65543c71adb89408531ea59855aafcf5bafd466bf517626a49cd252641f SHA512 4865c09dbbc0db885af69ec5ef0a731e2f55455f296b343b1cb05d3233e1e18c397b3b0a21eb0a6a86f85f20bf4e62f5e968fdf3cab45f6b5e3e3f9ee27d5e80
DIST eisl-2.60.tar.gz 1858691 BLAKE2B 9fc235c13f8e4c83a19bfffaaf94d19b07ae6cb5b1b60041d45da47451fee535a8153be9c360c5b496e33dba0618cc4d871d50a5f5d044675070ce406d635a0a SHA512 abb30b8b8ac1fe39f40292b3e6393d35f3de0cc736aa70125e86d624f32f8ce2b5cbcbbf417e080afc4dc3d49294c42283bfa3f59665e15a7545c10b245ff723
+DIST eisl-2.62.tar.gz 2004955 BLAKE2B a69651f002d8ca418cb863670ddd5931ac8afbbe8dd922fe71717ec8d9e3edbd802dd70ea9035264bba50f4dbcac2657d59d9fd58733c8fce1572ac95b7693e8 SHA512 69674bab8bbb91ebc27abe319afeb71d6cef4eaa74e969b8c3e174f254422fcdeba006d11454fc9d82f1e96bc9b51e8f4a1c7a8a20f14b0006e596eea680397b
diff --git a/dev-lang/eisl/eisl-2.62.ebuild b/dev-lang/eisl/eisl-2.62.ebuild
new file mode 100644
index 000000000000..3b3256166271
--- /dev/null
+++ b/dev-lang/eisl/eisl-2.62.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Interpreter and compiler compatible with the ISLisp standard"
+HOMEPAGE="https://github.com/sasagawa888/eisl/"
+SRC_URI="https://github.com/sasagawa888/eisl/archive/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test" # Tests run cppcheck (and fail)
+
+DOCS=( README{,-ja}.md documents )
+
+RDEPEND="sys-libs/ncurses:="
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-Makefile.patch )
+
+src_compile() {
+ emake CC="$(tc-getCC)" clean edlis eisl
+}
+
+src_install() {
+ exeinto /usr/bin
+ doexe edlis eisl
+
+ # Compilation of ISLisp files on installation fails.
+ # Do not compile them and mimic "make install".
+ insinto /usr/share/${PN}
+ doins -r library
+ doins fast.h ffi.h
+
+ einstalldocs
+}
diff --git a/dev-lang/eisl/files/eisl-2.62-Makefile.patch b/dev-lang/eisl/files/eisl-2.62-Makefile.patch
new file mode 100644
index 000000000000..4cb42997dfc2
--- /dev/null
+++ b/dev-lang/eisl/files/eisl-2.62-Makefile.patch
@@ -0,0 +1,33 @@
+--- a/makefile
++++ b/makefile
+@@ -31,7 +31,7 @@ else
+ endif
+ endif
+ endif
+-CFLAGS := $(INCS) -Wall -Wextra -D_FORTIFY_SOURCE=2 $(CURSES_CFLAGS) -U_XOPEN_SOURCE -D_XOPEN_SOURCE=700 -Inana/src
++CFLAGS += $(INCS) -Wall -Wextra $(CURSES_CFLAGS) -U_XOPEN_SOURCE -D_XOPEN_SOURCE=700 -Inana/src
+ DFLAGS := --preview=all --de -w --O3 --release --betterC
+ SRC_CII := cii/src/except.c cii/src/fmt.c cii/src/str.c cii/src/text.c
+ SRC_D := dextension.d disl.d
+@@ -57,7 +57,7 @@ ifeq ($(DEBUG),1)
+ LDFLAGS := -fsanitize=undefined
+ endif
+ else
+- CFLAGS += -O3 -flto -DNDEBUG=1 -DWITHOUT_NANA=1
++ CFLAGS += -DNDEBUG=1 -DWITHOUT_NANA=1
+ SRC_CII += cii/src/mem.c
+ endif
+ OBJ_CII := $(SRC_CII:.c=.o)
+@@ -75,11 +75,10 @@ ifeq ($(shell uname -n),raspberrypi)
+ CFLAGS += -D__rpi__
+ endif
+ ifneq ($(DEBUG),1)
+- LDFLAGS += -flto
+ ifeq ($(shell uname),Darwin)
+ LDFLAGS += -Wl,-S,-x
+ else
+- LDFLAGS += -s
++ LDFLAGS +=
+ endif
+ endif
+ PREFIX := /usr/local
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/eisl/, dev-lang/eisl/files/
@ 2023-02-16 15:53 Maciej Barć
0 siblings, 0 replies; 4+ messages in thread
From: Maciej Barć @ 2023-02-16 15:53 UTC (permalink / raw
To: gentoo-commits
commit: 30cc28bd0a5f1835efdf8a00979dbc28e29e637c
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 16 14:31:23 2023 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 15:53:55 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30cc28bd
dev-lang/eisl: fix implicit
Closes: https://bugs.gentoo.org/883345
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
dev-lang/eisl/eisl-2.65.ebuild | 5 ++++-
dev-lang/eisl/eisl-2.69.ebuild | 5 ++++-
dev-lang/eisl/eisl-2.70.ebuild | 5 ++++-
dev-lang/eisl/eisl-2.72.ebuild | 5 ++++-
dev-lang/eisl/files/eisl-2.65-implicit.patch | 11 +++++++++++
5 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/dev-lang/eisl/eisl-2.65.ebuild b/dev-lang/eisl/eisl-2.65.ebuild
index 91c3d9039c48..720552e43dac 100644
--- a/dev-lang/eisl/eisl-2.65.ebuild
+++ b/dev-lang/eisl/eisl-2.65.ebuild
@@ -20,7 +20,10 @@ DOCS=( README{,-ja}.md documents )
RDEPEND="sys-libs/ncurses:="
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}"/${PN}-2.63-Makefile.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.63-Makefile.patch
+ "${FILESDIR}"/${PN}-2.65-implicit.patch
+)
src_compile() {
emake CC="$(tc-getCC)" clean edlis eisl
diff --git a/dev-lang/eisl/eisl-2.69.ebuild b/dev-lang/eisl/eisl-2.69.ebuild
index 737f99d4990a..c79630e56a74 100644
--- a/dev-lang/eisl/eisl-2.69.ebuild
+++ b/dev-lang/eisl/eisl-2.69.ebuild
@@ -20,7 +20,10 @@ DOCS=( README{,-ja}.md documents )
RDEPEND="sys-libs/ncurses:="
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}"/${PN}-2.67-Makefile.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.67-Makefile.patch
+ "${FILESDIR}"/${PN}-2.65-implicit.patch
+)
src_compile() {
emake CC="$(tc-getCC)" clean edlis eisl
diff --git a/dev-lang/eisl/eisl-2.70.ebuild b/dev-lang/eisl/eisl-2.70.ebuild
index 97bd3630d4a3..82b169ce706a 100644
--- a/dev-lang/eisl/eisl-2.70.ebuild
+++ b/dev-lang/eisl/eisl-2.70.ebuild
@@ -20,7 +20,10 @@ DOCS=( README{,-ja}.md documents )
RDEPEND="sys-libs/ncurses:="
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}"/${PN}-2.67-Makefile.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.67-Makefile.patch
+ "${FILESDIR}"/${PN}-2.65-implicit.patch
+)
src_compile() {
emake CC="$(tc-getCC)" clean edlis eisl
diff --git a/dev-lang/eisl/eisl-2.72.ebuild b/dev-lang/eisl/eisl-2.72.ebuild
index 97bd3630d4a3..82b169ce706a 100644
--- a/dev-lang/eisl/eisl-2.72.ebuild
+++ b/dev-lang/eisl/eisl-2.72.ebuild
@@ -20,7 +20,10 @@ DOCS=( README{,-ja}.md documents )
RDEPEND="sys-libs/ncurses:="
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}"/${PN}-2.67-Makefile.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.67-Makefile.patch
+ "${FILESDIR}"/${PN}-2.65-implicit.patch
+)
src_compile() {
emake CC="$(tc-getCC)" clean edlis eisl
diff --git a/dev-lang/eisl/files/eisl-2.65-implicit.patch b/dev-lang/eisl/files/eisl-2.65-implicit.patch
new file mode 100644
index 000000000000..d4bb779e177e
--- /dev/null
+++ b/dev-lang/eisl/files/eisl-2.65-implicit.patch
@@ -0,0 +1,11 @@
+--- a/main.c
++++ b/main.c
+@@ -252,7 +252,7 @@ static inline void maybe_greet(void)
+ Fmt_print("Easy-ISLisp Ver%1.2f\n", VERSION);
+ }
+
+-static inline disable_repl_flag(void)
++static inline void disable_repl_flag(void)
+ {
+ #ifndef WITHOUT_CURSES
+ repl_flag = false;
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/eisl/, dev-lang/eisl/files/
@ 2025-01-12 14:26 Maciej Barć
0 siblings, 0 replies; 4+ messages in thread
From: Maciej Barć @ 2025-01-12 14:26 UTC (permalink / raw
To: gentoo-commits
commit: 1f41d6b722590a98ab8ad0de3e93c4a538bec7d9
Author: NHOrus <jy6x2b32pie9 <AT> yahoo <DOT> com>
AuthorDate: Sun Jan 12 14:12:15 2025 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sun Jan 12 14:25:55 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f41d6b7
dev-lang/eisl: add 5.41
With backported upstream patch to fix build with C23.
Patch would be unneeded next upstream release.
Bug: https://bugs.gentoo.org/942206
Signed-off-by: NHOrus <jy6x2b32pie9 <AT> yahoo.com>
Closes: https://github.com/gentoo/gentoo/pull/40102
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
dev-lang/eisl/Manifest | 1 +
dev-lang/eisl/eisl-5.41.ebuild | 57 ++++++++++++++++++++++++++++
dev-lang/eisl/files/eisl-5.41-makefile.patch | 52 +++++++++++++++++++++++++
3 files changed, 110 insertions(+)
diff --git a/dev-lang/eisl/Manifest b/dev-lang/eisl/Manifest
index 1dd4d617c243..628e5197844d 100644
--- a/dev-lang/eisl/Manifest
+++ b/dev-lang/eisl/Manifest
@@ -1,3 +1,4 @@
DIST eisl-5.38.tar.gz 3136867 BLAKE2B cfe62da4882a8f687c683345c3518a7245bdfc87b17dd6b956cc3b5db494631c6cb3a2ca24ecfe1454671e8d1e14c9052ae4c119b4855c585fbb93c99af0ddba SHA512 4bed412660700ddba7a8015b1488adcaf9ff89aed5ac5af0a51c65af76ec78fa4dab04b092c4ad7404ce3fb071dff7d219810c4422a983375e5634861de81698
DIST eisl-5.39.tar.gz 3137025 BLAKE2B 1aca7df4b629b9e9b71fa8355654d65a84cf3f08a59111a978f6d3868377f2fb857041a83f2044dc3d367624b910aaee701d5a4b0dea2d4aa94c49f0aaa60ef4 SHA512 976f5ae8eab96be135ab52b2abdac36ebeef6987ff4091639f29105d9b81f2f4f092a38d60e8ad0f746a42dedc362f95e4a26a8e375bff2f3fc7f7215243dd2b
DIST eisl-5.40.tar.gz 3140344 BLAKE2B aa00ff32302a6a9f1d9772f8e9c2690e47f1d466ec433c2f4519434a599d8b6bdb923e3bbdb1a278b3aaa1274ea139ff46e1bb736f972ab495f0dfc031de1916 SHA512 44e2ca7a35c3e200e7d8b0bd948427e0bfa81e678269df81d3e36e601123c1528c25a4b2d13b5d92956378b27c5211caa5e51113763099af4b9b65bf369382fd
+DIST eisl-5.41.tar.gz 3140179 BLAKE2B b60ec0209313973af31b0940317fdecd8e87c9de46093830d7e3c3924bbab9ef5da638a67b43b91a3c351d3d357817fcf26a56aeb2203e3f2a1865c797c743b1 SHA512 1b87a4c16b75289a95ffee20b7182151701736c96f3ddcdf1e00ef51356b668059b43cab39e9dd3b1f193b102f1f7cd32e435c0d212342e2544fff9507dfb99a
diff --git a/dev-lang/eisl/eisl-5.41.ebuild b/dev-lang/eisl/eisl-5.41.ebuild
new file mode 100644
index 000000000000..0cbe742c8a06
--- /dev/null
+++ b/dev-lang/eisl/eisl-5.41.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Interpreter and compiler compatible with the ISLisp standard"
+HOMEPAGE="https://github.com/sasagawa888/eisl/"
+
+if [[ "${PV}" == *9999* ]] ; then
+ inherit git-r3
+
+ EGIT_REPO_URI="https://github.com/sasagawa888/${PN}.git"
+else
+ SRC_URI="https://github.com/sasagawa888/${PN}/archive/v${PV}.tar.gz
+ -> ${P}.tar.gz"
+
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+RESTRICT="test" # Tests run cppcheck (and fail)
+
+DOCS=( README{,-ja}.md documents )
+
+RDEPEND="
+ sys-libs/ncurses:=
+"
+DEPEND="
+ ${RDEPEND}
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.60-Makefile.patch"
+ "${FILESDIR}/${PN}-5.41-makefile.patch" )
+
+src_compile() {
+ # bug https://bugs.gentoo.org/939771
+ # don't clean and compile in one invocation with --shuffle possible
+ emake CC="$(tc-getCC)" clean
+ emake CC="$(tc-getCC)" edlis eisl
+}
+
+src_install() {
+ exeinto /usr/bin
+ doexe edlis eisl
+
+ # Compilation of ISLisp files on installation fails.
+ # Do not compile them and mimic "make install".
+ insinto "/usr/share/${PN}"
+ doins -r library
+ doins fast.h ffi.h
+
+ einstalldocs
+}
diff --git a/dev-lang/eisl/files/eisl-5.41-makefile.patch b/dev-lang/eisl/files/eisl-5.41-makefile.patch
new file mode 100644
index 000000000000..eff42346b85d
--- /dev/null
+++ b/dev-lang/eisl/files/eisl-5.41-makefile.patch
@@ -0,0 +1,52 @@
+Upstream commit https://github.com/sasagawa888/eisl/commit/5bd9332998e23298a3d0a3fb7066bdf98dbe5b0b
+Fixes for https://github.com/sasagawa888/eisl/issues/335 https://github.com/sasagawa888/eisl/issues/334
+Edited to accomodate our makefile patch
+Bug https://bugs.gentoo.org/939771
+Bug https://bugs.gentoo.org/942206
+should be fropped from 5.42
+
+From 5bd9332998e23298a3d0a3fb7066bdf98dbe5b0b Mon Sep 17 00:00:00 2001
+From: sasagawa888 <ken-s@tkcnf.or.jp>
+Date: Sun, 12 Jan 2025 09:08:47 +0900
+Subject: [PATCH] Modify makefile
+
+---
+ makefile | 18 +++++++++++++++++-
+ 1 file changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/makefile b/makefile
+index 2755d0c8..b666f95d 100644
+--- a/makefile
++++ b/makefile
+@@ -42,7 +42,7 @@ else
+ endif
+ endif
+ endif
+-CFLAGS += $(INCS) -g $(CURSES_CFLAGS) -U_XOPEN_SOURCE -Inana/src
++CFLAGS += $(INCS) -g $(CURSES_CFLAGS) -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -Inana/src
+ DFLAGS := --preview=all --de -w --O3 --release --betterC
+ SRC_CII := cii/src/except.c cii/src/fmt.c cii/src/str.c cii/src/text.c
+ SRC_D := dextension.d disl.d
+@@ -1545,6 +155,22 @@ ifeq ($(DEBUG),1)
+ main.o: nana/src/nana-config.h
+ endif
+
++main.o: function.o extension.o syntax.o data.o gbc.o cell.o error.o bignum.o compute.o edit.o syn_highlight.o long.o link.o
++function.o: function.c eisl.h
++extension.o: extension.c eisl.h
++syntax.o: syntax.c eisl.h
++data.o: data.c eisl.h
++gbc.o: gbc.c eisl.h
++cell.o: cell.c eisl.h
++error.o: error.c eisl.h
++bignum.o: bignum.c eisl.h
++compute.o: compute.c eisl.h
++edit.o: edit.c eisl.h
++syntax_highlight.o: syntax_highlight.c eisl.h
++long.o: long.c eisl.h
++link.o: link.c eisl.h
++
++
+ nana/src/nana-config.h:
+ -cd nana; autoreconf -fi; ./configure
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-01-12 14:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-04 18:38 [gentoo-commits] repo/gentoo:master commit in: dev-lang/eisl/, dev-lang/eisl/files/ Maciej Barć
-- strict thread matches above, loose matches on Subject: below --
2025-01-12 14:26 Maciej Barć
2023-02-16 15:53 Maciej Barć
2022-08-02 21:19 Maciej Barć
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox