public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:dev commit in: www-servers/quark/files/, www-servers/quark/
@ 2025-06-07  7:55 Viorel Munteanu
  2025-06-07  8:33 ` [gentoo-commits] repo/proj/guru:master " Viorel Munteanu
  0 siblings, 1 reply; 2+ messages in thread
From: Viorel Munteanu @ 2025-06-07  7:55 UTC (permalink / raw
  To: gentoo-commits

commit:     764e9c7f3346bd712748489fc4fd5a90425db0ab
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  7 06:53:53 2025 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sat Jun  7 06:53:53 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=764e9c7f

www-servers/quark: update EAPI 7 -> 8

Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 www-servers/quark/files/quark-9999-configure.patch | 21 +++++++++++++++++++++
 www-servers/quark/quark-9999.ebuild                | 17 ++++++++++-------
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/www-servers/quark/files/quark-9999-configure.patch b/www-servers/quark/files/quark-9999-configure.patch
new file mode 100644
index 0000000000..8e4ce89a4b
--- /dev/null
+++ b/www-servers/quark/files/quark-9999-configure.patch
@@ -0,0 +1,21 @@
+Do not overwrite *FLAGS
+Use CC and PREFIX from the environment
+
+--- a/config.mk
++++ b/config.mk
+@@ -4,13 +4,8 @@
+ # Customize below to fit your system
+ 
+ # paths
+-PREFIX = /usr/local
+ MANPREFIX = $(PREFIX)/share/man
+ 
+ # flags
+-CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700 -D_BSD_SOURCE
+-CFLAGS   = -std=c99 -pedantic -Wall -Wextra -Os
+-LDFLAGS  = -lpthread -s
+-
+-# compiler and linker
+-CC = cc
++CPPFLAGS += -DVERSION=\"$(VERSION)\" -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700 -D_BSD_SOURCE
++LDFLAGS  += -lpthread

diff --git a/www-servers/quark/quark-9999.ebuild b/www-servers/quark/quark-9999.ebuild
index 9bc3612b6e..88e885d238 100644
--- a/www-servers/quark/quark-9999.ebuild
+++ b/www-servers/quark/quark-9999.ebuild
@@ -1,19 +1,22 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit git-r3
+EAPI=8
+
+inherit git-r3 toolchain-funcs
+
 DESCRIPTION="A small, GET-only static HTTP server"
 HOMEPAGE="https://tools.suckless.org/quark/"
 EGIT_REPO_URI="https://git.suckless.org/quark/"
-S="${WORKDIR}/${P}"
 
 LICENSE="ISC"
 SLOT="0"
 
+PATCHES=(
+	"${FILESDIR}"/quark-9999-configure.patch
+)
+
 src_configure() {
-	sed -in 's/local//' config.mk
-	sed -in 's/d -s/d/' config.mk
-	sed -in 's/CF/#CF/' config.mk
-	sed -in 's/CPP/#CPP/' config.mk
+	export CC=$(tc-getCC)
+	export PREFIX="${EPREFIX}"/usr
 }


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/proj/guru:master commit in: www-servers/quark/files/, www-servers/quark/
  2025-06-07  7:55 [gentoo-commits] repo/proj/guru:dev commit in: www-servers/quark/files/, www-servers/quark/ Viorel Munteanu
@ 2025-06-07  8:33 ` Viorel Munteanu
  0 siblings, 0 replies; 2+ messages in thread
From: Viorel Munteanu @ 2025-06-07  8:33 UTC (permalink / raw
  To: gentoo-commits

commit:     764e9c7f3346bd712748489fc4fd5a90425db0ab
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  7 06:53:53 2025 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sat Jun  7 06:53:53 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=764e9c7f

www-servers/quark: update EAPI 7 -> 8

Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 www-servers/quark/files/quark-9999-configure.patch | 21 +++++++++++++++++++++
 www-servers/quark/quark-9999.ebuild                | 17 ++++++++++-------
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/www-servers/quark/files/quark-9999-configure.patch b/www-servers/quark/files/quark-9999-configure.patch
new file mode 100644
index 0000000000..8e4ce89a4b
--- /dev/null
+++ b/www-servers/quark/files/quark-9999-configure.patch
@@ -0,0 +1,21 @@
+Do not overwrite *FLAGS
+Use CC and PREFIX from the environment
+
+--- a/config.mk
++++ b/config.mk
+@@ -4,13 +4,8 @@
+ # Customize below to fit your system
+ 
+ # paths
+-PREFIX = /usr/local
+ MANPREFIX = $(PREFIX)/share/man
+ 
+ # flags
+-CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700 -D_BSD_SOURCE
+-CFLAGS   = -std=c99 -pedantic -Wall -Wextra -Os
+-LDFLAGS  = -lpthread -s
+-
+-# compiler and linker
+-CC = cc
++CPPFLAGS += -DVERSION=\"$(VERSION)\" -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700 -D_BSD_SOURCE
++LDFLAGS  += -lpthread

diff --git a/www-servers/quark/quark-9999.ebuild b/www-servers/quark/quark-9999.ebuild
index 9bc3612b6e..88e885d238 100644
--- a/www-servers/quark/quark-9999.ebuild
+++ b/www-servers/quark/quark-9999.ebuild
@@ -1,19 +1,22 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit git-r3
+EAPI=8
+
+inherit git-r3 toolchain-funcs
+
 DESCRIPTION="A small, GET-only static HTTP server"
 HOMEPAGE="https://tools.suckless.org/quark/"
 EGIT_REPO_URI="https://git.suckless.org/quark/"
-S="${WORKDIR}/${P}"
 
 LICENSE="ISC"
 SLOT="0"
 
+PATCHES=(
+	"${FILESDIR}"/quark-9999-configure.patch
+)
+
 src_configure() {
-	sed -in 's/local//' config.mk
-	sed -in 's/d -s/d/' config.mk
-	sed -in 's/CF/#CF/' config.mk
-	sed -in 's/CPP/#CPP/' config.mk
+	export CC=$(tc-getCC)
+	export PREFIX="${EPREFIX}"/usr
 }


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2025-06-07  8:34 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-06-07  7:55 [gentoo-commits] repo/proj/guru:dev commit in: www-servers/quark/files/, www-servers/quark/ Viorel Munteanu
2025-06-07  8:33 ` [gentoo-commits] repo/proj/guru:master " Viorel Munteanu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox