commit: e3d109848cfb1285d0661ab31106c5124ecbb505 Author: NHOrus <jy6x2b32pie9 <AT> yahoo <DOT> com> AuthorDate: Mon Dec 8 15:24:13 2025 +0000 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> CommitDate: Mon Dec 8 15:57:14 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3d10984
dev-lang/eisl: add 5.61, drop 5.57 Remove CFLAGS from FLAGS, CFLAGS already picked, no need to repeat it twice in compiler invocations Closes: https://bugs.gentoo.org/967217 Signed-off-by: NHOrus <jy6x2b32pie9 <AT> yahoo.com> Part-of: https://github.com/gentoo/gentoo/pull/44954 Closes: https://github.com/gentoo/gentoo/pull/44954 Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> dev-lang/eisl/Manifest | 2 +- .../eisl/{eisl-5.57.ebuild => eisl-5.61.ebuild} | 4 +-- dev-lang/eisl/files/eisl-5.61-makefile.patch | 37 ++++++++++++++++++++++ 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dev-lang/eisl/Manifest b/dev-lang/eisl/Manifest index 44424dd7c6e7..86a386869ab3 100644 --- a/dev-lang/eisl/Manifest +++ b/dev-lang/eisl/Manifest @@ -1,3 +1,3 @@ DIST eisl-5.56.gh.tar.gz 1800202 BLAKE2B 3d21e5e9519e80e0d96e567a17c30491f234f39347f642b0124a19064477f080aa67d98f457dadc71554731a742cce3139dcedaf73d682f260f721044be587f4 SHA512 6dc4c07c38402a748aad754e66d5e55db17bb28347219e8e18b55038f670c1ac30e20968fa94b1635be2380e84fac3877882df35e7f9e5ca969784a95ba84e54 -DIST eisl-5.57.gh.tar.gz 1800586 BLAKE2B 6f9a4ca57c7b1f3e20ba50078b8244452ef9b1e473d4b7bf8340ecf4dd5918b3be2c6950e755798a6a615e231b056ccfc50e9dc511964c61d3b1fcf9135588b8 SHA512 1e0ab4587fd8df1e1b5292223cd8f21358117b0f0706860ebdcf0db363495496760857c5fed82fde15eb5bdbb5a052769f2fdbdd72f05f726c6d498f309eb7d8 DIST eisl-5.58.gh.tar.gz 1800555 BLAKE2B 91b1dbe01e9fe04bd39f8a6631fbb58069b4d5ba5ee8663afd42a3a4eca8466897b947b19aa647e552bfb6025f2610dee0b0e14789cf999c47cba46036eb86a0 SHA512 05cabbf7b2a33285589d0a4c89613f75937013eaef97acc83eca9270c4ede1c0f17135b076081f62ad2de5d5eead050082029752dc42765c29b68d9ec4a01a09 +DIST eisl-5.61.gh.tar.gz 3064816 BLAKE2B 88c7c75cc9b213832531bc355e55c2ccd7a1db205ea7f0d2be7bedb924f1ead01efee2c644c6c5a55d30de52c4faf444d3fa9607f7ac71a8e41636434efa172e SHA512 cf4b3a28030e5262a54c7a138ce103b0fe616594887a7fc6fe0002bdb9681c4e924ea70712fa9135f2104a819eb1e094dfdbfc537c594a93a6d2fe9bb0420773 diff --git a/dev-lang/eisl/eisl-5.57.ebuild b/dev-lang/eisl/eisl-5.61.ebuild similarity index 91% rename from dev-lang/eisl/eisl-5.57.ebuild rename to dev-lang/eisl/eisl-5.61.ebuild index a560935ddec8..faff44213e63 100644 --- a/dev-lang/eisl/eisl-5.57.ebuild +++ b/dev-lang/eisl/eisl-5.61.ebuild @@ -33,7 +33,7 @@ DEPEND=" " PATCHES=( - "${FILESDIR}/${PN}-5.53-makefile.patch" + "${FILESDIR}/${P}-makefile.patch" ) src_compile() { @@ -41,7 +41,7 @@ src_compile() { # don't clean and compile in one invocation with --shuffle possible local target="" for target in clean edlis eisl ; do - emake CC="$(tc-getCC)" FLAGS="${CFLAGS} ${LDFLAGS}" "${target}" + emake CC="$(tc-getCC)" FLAGS="${LDFLAGS}" "${target}" done } diff --git a/dev-lang/eisl/files/eisl-5.61-makefile.patch b/dev-lang/eisl/files/eisl-5.61-makefile.patch new file mode 100644 index 000000000000..3a01886a6f66 --- /dev/null +++ b/dev-lang/eisl/files/eisl-5.61-makefile.patch @@ -0,0 +1,37 @@ +Remove hardcoded optimization level + +--- a/makefile ++++ b/makefile +@@ -12,8 +12,9 @@ + CURSES_CFLAGS := $(shell ncursesw6-config --cflags) + CURSES_LIBS := $(shell ncursesw6-config --libs) + +- +-CFLAGS += $(INCS) -Wall $(CURSES_CFLAGS) ++LIBS += $(CURSES_LIBS) ++FLAGS := ++CFLAGS += $(FLAGS) $(INCS) -Wall $(CURSES_CFLAGS) + + # Files in library/ that need to be compiled + SRC_LISP := library/bit.lsp \ +@@ -29,19 +30,13 @@ + library/plot.lsp \ + library/unistd.lsp + +-CFLAGS += -O3 +- + ifeq ($(USE_FLTO),1) +-CFLAGS += -O3 -flto ++CFLAGS += -flto + endif + ifeq ($(USE_GDB),1) + CFLAGS += -O0 -g + endif + +-ifeq ($(shell uname -n),raspberrypi) +-CFLAGS += -O3 +-endif +- + OBJ_LISP := $(SRC_LISP:.lsp=.o) + + ifeq ($(shell uname -n),raspberrypi)
