* [gentoo-commits] repo/gentoo:master commit in: dev-libs/boron/, dev-libs/boron/files/
@ 2024-07-19 14:44 Arthur Zamarin
0 siblings, 0 replies; 2+ messages in thread
From: Arthur Zamarin @ 2024-07-19 14:44 UTC (permalink / raw
To: gentoo-commits
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
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/boron/, dev-libs/boron/files/
@ 2024-07-20 11:21 Arthur Zamarin
0 siblings, 0 replies; 2+ messages in thread
From: Arthur Zamarin @ 2024-07-20 11:21 UTC (permalink / raw
To: gentoo-commits
commit: 0f5dfcdb4f09dad8aacba48ee2b2c5ccf2507eb8
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Fri Jul 19 16:05:36 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 20 11:21:08 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f5dfcdb
dev-libs/boron: drop 2.0.8
Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37619
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-libs/boron/Manifest | 1 -
dev-libs/boron/boron-2.0.8.ebuild | 37 -------------
dev-libs/boron/files/boron-2.0.8_makefile.patch | 69 -------------------------
3 files changed, 107 deletions(-)
diff --git a/dev-libs/boron/Manifest b/dev-libs/boron/Manifest
index 247491b31f40..465d2f8278e8 100644
--- a/dev-libs/boron/Manifest
+++ b/dev-libs/boron/Manifest
@@ -1,2 +1 @@
-DIST boron-2.0.8.tar.gz 351968 BLAKE2B c89b61ca2cf55960edd5cfbb8b6bfe9501cfca775a250d325d5f2874423aafca5d9157600a1859c17909c6948f47830613e42b2b916335636876c60ffe7782d2 SHA512 b583dfafc10a640c2cf919b38e5bcdfcbe146e874d4c41fbd4fc6d510ea38938b3e91de502f42e5b2923c9dd201358ffe15c0df47655ac8a8ed2294979338db0
DIST boron-2.1.0.tar.gz 366773 BLAKE2B 23af3d86d153e9efd6e7660dd31c6c08bfdca542b56aa6893f06c353d92aded224d50a9ec1159930012e87874cf44ee437e7873b4cfb834b49a05977c4bb16d5 SHA512 2cd2c8043efc9569ae579fa7e7365567dca9cb5ec39218b83ef015936a60ff9ea61cac1b40b8593aacf8aaa9b12aaf00baa0c55adb6cd1238ca91ae4d1190636
diff --git a/dev-libs/boron/boron-2.0.8.ebuild b/dev-libs/boron/boron-2.0.8.ebuild
deleted file mode 100644
index 428f9ef87c32..000000000000
--- a/dev-libs/boron/boron-2.0.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bzip2 readline"
-
-DEPEND="
- bzip2? ( app-arch/bzip2:= )
- !bzip2? ( sys-libs/zlib:= )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.0.8_makefile.patch"
-)
-
-src_configure() {
- tc-export CC
- # Non-standard configure
- edo ./configure \
- $(usex bzip2 "--bzip2" "")
-}
-
-src_install() {
- emake DESTDIR="${D}/usr" install install-dev
- dodoc README.md
-}
diff --git a/dev-libs/boron/files/boron-2.0.8_makefile.patch b/dev-libs/boron/files/boron-2.0.8_makefile.patch
deleted file mode 100644
index 915f491e3e58..000000000000
--- a/dev-libs/boron/files/boron-2.0.8_makefile.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 8f796a61697e9efe1d6e5498b807e74fc274af24 Mon Sep 17 00:00:00 2001
-From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
-Date: Fri, 28 Apr 2023 12:01:28 +0300
-Subject: [PATCH] Fixes to buildsystem
-
-* Properly respect CFLAGS
-* Respect LDFLAGS
-* Don't compress man-pages
-* Don't strip binaries
---- a/Makefile
-+++ b/Makefile
-@@ -11,7 +11,7 @@
-
- OS := $(shell uname)
-
--CFLAGS = -pipe -pedantic -Wall -W -Iinclude -Iurlan -Ieval -Isupport
-+CFLAGS += -pipe -pedantic -Wall -W -Iinclude -Iurlan -Ieval -Isupport
- CFLAGS += -O3 -DNDEBUG
- #CFLAGS += -g -DDEBUG
-
-@@ -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)
-
- $(ODIR)/os.o: unix/os.c
-- 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) $(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 +130,12 @@
- install_name_tool -change libboron.dylib $(LIB_DIR)/libboron.dylib boron
- install -m 644 libboron.dylib $(LIB_DIR)
- else
-- install -m 755 -s $(BORON_LIB) $(LIB_DIR)
-+ install -m 755 $(BORON_LIB) $(LIB_DIR)
- ln -s $(BORON_LIB) $(LIB_DIR)/libboron.so.2
- endif
- endif
-- install -s -m 755 boron $(BIN_DIR)
-- gzip -c -n doc/boron.troff > doc/boron.1.gz
-- 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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-07-20 11:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-19 14:44 [gentoo-commits] repo/gentoo:master commit in: dev-libs/boron/, dev-libs/boron/files/ Arthur Zamarin
-- strict thread matches above, loose matches on Subject: below --
2024-07-20 11:21 Arthur Zamarin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox