public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/netboot/, sys-boot/netboot/files/
Date: Sat, 11 Feb 2023 04:26:46 +0000 (UTC)	[thread overview]
Message-ID: <1676089154.d0ab40cc6ba5686a3100be04dd948bbd8f3f69b4.sam@gentoo> (raw)

commit:     d0ab40cc6ba5686a3100be04dd948bbd8f3f69b4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 11 04:18:49 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 04:19:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0ab40cc

sys-boot/netboot: fix configure w/ clang 16

also force bison+flex.

Closes: https://bugs.gentoo.org/875116
Closes: https://bugs.gentoo.org/881463
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/netboot-0.10.2-configure-clang16.patch   | 37 ++++++++++++++++++++++
 ...t-0.10.2-r3.ebuild => netboot-0.10.2-r4.ebuild} | 15 ++++++---
 2 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/sys-boot/netboot/files/netboot-0.10.2-configure-clang16.patch b/sys-boot/netboot/files/netboot-0.10.2-configure-clang16.patch
new file mode 100644
index 000000000000..41c13bb634e2
--- /dev/null
+++ b/sys-boot/netboot/files/netboot-0.10.2-configure-clang16.patch
@@ -0,0 +1,37 @@
+https://bugs.gentoo.org/875116
+--- a/configure
++++ b/configure
+@@ -10772,6 +10772,7 @@ else
+ #endif
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ #ifdef RTLD_GLOBAL
+ #  define LT_DLGLOBAL		RTLD_GLOBAL
+@@ -25362,7 +25363,7 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-
++#include <stdlib.h>
+ #pragma pack(1)
+ 			struct {
+ 				char c[3];
+@@ -25441,7 +25442,7 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-
++#include <stdlib.h>
+ #pragma options align=packed
+ 				struct {
+ 					char c[3];
+@@ -27724,6 +27725,7 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++#include <stdlib.h>
+ 
+ #ifdef USE_PACKED
+ # define PACKED __attribute__((packed))

diff --git a/sys-boot/netboot/netboot-0.10.2-r3.ebuild b/sys-boot/netboot/netboot-0.10.2-r4.ebuild
similarity index 89%
rename from sys-boot/netboot/netboot-0.10.2-r3.ebuild
rename to sys-boot/netboot/netboot-0.10.2-r4.ebuild
index bdaaf75e7d25..1f2eca9cc44b 100644
--- a/sys-boot/netboot/netboot-0.10.2-r3.ebuild
+++ b/sys-boot/netboot/netboot-0.10.2-r4.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit toolchain-funcs
-
 DESCRIPTION="Allows to remote boot a computer over an IP network"
 HOMEPAGE="http://netboot.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -19,12 +17,16 @@ DEPEND="
 	lzo? ( dev-libs/lzo:2= )
 	odbc? ( dev-db/unixODBC:= )
 "
-
 RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
 
 PATCHES=(
 	"${FILESDIR}/${P}-ldflags.patch"
 	"${FILESDIR}/${P}-slibtool.patch"
+	"${FILESDIR}/${P}-configure-clang16.patch"
 )
 
 src_prepare() {
@@ -41,6 +43,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# Force Bison
+	unset YACC
+	# Uses yy_fatal_error
+	export LEX=flex
+
 	local myeconfargs=(
 		--datadir="/usr/share/netboot"
 		$(use_with berkdb berkeley-db)


             reply	other threads:[~2023-02-11  4:26 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-11  4:26 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-03-25 22:47 [gentoo-commits] repo/gentoo:master commit in: sys-boot/netboot/, sys-boot/netboot/files/ Conrad Kostecki

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1676089154.d0ab40cc6ba5686a3100be04dd948bbd8f3f69b4.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox