commit: 033ed74419349447c84c1df5c583b15cbbc1775f Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> AuthorDate: Fri Jul 19 14:43:09 2024 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Fri Jul 19 14:43:57 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=033ed744
dev-libs/boron: fix direct call to cc Closes: https://bugs.gentoo.org/936308 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> dev-libs/boron/boron-2.0.8.ebuild | 10 +++--- dev-libs/boron/files/boron-2.0.8_makefile.patch | 48 +++++++++++++++---------- 2 files changed, 35 insertions(+), 23 deletions(-) diff --git a/dev-libs/boron/boron-2.0.8.ebuild b/dev-libs/boron/boron-2.0.8.ebuild index db885c01179b..428f9ef87c32 100644 --- a/dev-libs/boron/boron-2.0.8.ebuild +++ b/dev-libs/boron/boron-2.0.8.ebuild @@ -1,8 +1,10 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +inherit edo toolchain-funcs + DESCRIPTION="A scripting language similar to REBOL" HOMEPAGE="https://urlan.sourceforge.net/boron/"; SRC_URI="https://downloads.sourceforge.net/urlan/${P}.tar.gz"; @@ -23,10 +25,10 @@ PATCHES=( ) src_configure() { + tc-export CC # Non-standard configure - ./configure \ - $(usex bzip2 "--bzip2" "") \ - || die + edo ./configure \ + $(usex bzip2 "--bzip2" "") } src_install() { diff --git a/dev-libs/boron/files/boron-2.0.8_makefile.patch b/dev-libs/boron/files/boron-2.0.8_makefile.patch index f524663756d5..915f491e3e58 100644 --- a/dev-libs/boron/files/boron-2.0.8_makefile.patch +++ b/dev-libs/boron/files/boron-2.0.8_makefile.patch @@ -9,35 +9,48 @@ Subject: [PATCH] Fixes to buildsystem * Don't strip binaries --- a/Makefile +++ b/Makefile -@@ -11,8 +11,7 @@ VIM_DIR=$(DESTDIR)/share/vim/vimfiles/syntax - +@@ -11,7 +11,7 @@ + OS := $(shell uname) - + -CFLAGS = -pipe -pedantic -Wall -W -Iinclude -Iurlan -Ieval -Isupport --CFLAGS += -O3 -DNDEBUG +CFLAGS += -pipe -pedantic -Wall -W -Iinclude -Iurlan -Ieval -Isupport + CFLAGS += -O3 -DNDEBUG #CFLAGS += -g -DDEBUG - - ifeq ($(OS), Darwin) -@@ -91,7 +90,7 @@ $(ODIR)/%.o: eval/%.c - cc -c $(CFLAGS) $(CONFIG) $< -o $@ - + +@@ -84,17 +84,17 @@ + + + $(ODIR)/%.o: urlan/%.c +- cc -c $(CFLAGS) $(CONFIG) $< -o $@ ++ $(CC) -c $(CFLAGS) $(CONFIG) $< -o $@ + $(ODIR)/%.o: support/%.c +- cc -c $(CFLAGS) $(CONFIG) $< -o $@ ++ $(CC) -c $(CFLAGS) $(CONFIG) $< -o $@ + $(ODIR)/%.o: eval/%.c +- cc -c $(CFLAGS) $(CONFIG) $< -o $@ ++ $(CC) -c $(CFLAGS) $(CONFIG) $< -o $@ + boron: $(EXE_OBJS) $(BORON_LIB) - cc $^ -o $@ $(EXE_LIBS) -+ cc $^ -o $@ $(EXE_LIBS) $(LDFLAGS) - ++ $(CC) $^ -o $@ $(EXE_LIBS) + $(ODIR)/os.o: unix/os.c - cc -c $(CFLAGS) $(CONFIG) $< -o $@ -@@ -108,7 +107,7 @@ ifdef STATIC_LIB +- cc -c $(CFLAGS) $(CONFIG) $< -o $@ ++ $(CC) -c $(CFLAGS) $(LDFLAGS) $(CONFIG) $< -o $@ + + $(EXE_OBJS): | $(ODIR) + $(LIB_OBJS): | $(ODIR) +@@ -108,7 +108,7 @@ else ifeq ($(OS), Darwin) libtool -dynamiclib -o $@ $^ -install_name @rpath/$(BORON_LIB) $(LIBS) else - cc -o $@ -shared -Wl,-soname,libboron.so.2 $^ $(LIBS) -+ cc -o $@ -shared -Wl,-soname,libboron.so.2 $^ $(LIBS) $(LDFLAGS) ++ $(CC) $(LDFLAGS) -o $@ -shared -Wl,-soname,libboron.so.2 $^ $(LIBS) ln -sf $(BORON_LIB) libboron.so.2 ln -sf $(BORON_LIB) libboron.so endif -@@ -130,13 +129,12 @@ ifeq ($(OS), Darwin) +@@ -130,13 +130,12 @@ install_name_tool -change libboron.dylib $(LIB_DIR)/libboron.dylib boron install -m 644 libboron.dylib $(LIB_DIR) else @@ -51,9 +64,6 @@ Subject: [PATCH] Fixes to buildsystem - install -m 644 doc/boron.1.gz $(MAN_DIR) + install -m 755 boron $(BIN_DIR) + install -m 644 doc/boron.troff $(MAN_DIR)/boron.1 - + uninstall: rm -f $(BIN_DIR)/boron $(MAN_DIR)/boron.1 --- -2.39.2 -
