commit:     cb364948d367130f17b217bf23ab6ef6d56170ac
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  8 00:16:38 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb  8 00:18:17 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb364948

sys-devel/dev86: build fixes

* Use the bootblocks target instead as it couldn't find includes. I suspect
  it may work if dev86 is already installed?
* Set PATH to help find more components (though a patch does this too,
  it was needed when `emake`ing into the bootblocks directory as we did
  previously, but then I gave up on that)

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-devel/dev86/dev86-1.0.1.ebuild | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/sys-devel/dev86/dev86-1.0.1.ebuild 
b/sys-devel/dev86/dev86-1.0.1.ebuild
index 139510962c07..97dee3fb2656 100644
--- a/sys-devel/dev86/dev86-1.0.1.ebuild
+++ b/sys-devel/dev86/dev86-1.0.1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
 inherit toolchain-funcs
 
 DESCRIPTION="Bruce's C compiler - Simple C compiler to generate 8086 code"
@@ -39,19 +40,20 @@ src_compile() {
        ln -s ../kinclude/arch libc/include/arch || die
        ln -s ../kinclude/linuxmt libc/include/linuxmt || die
 
+       # This is needed to help find `bcc` and `bcc-cpp`.
+       export PATH=${S}/bcc:${S}/cpp:${S}/copt:${S}/bin:${PATH}
+
        # First `make` is also a config, so set all the path vars here
        emake -j1 \
-               CC="$(tc-getCC)" \
+               CC="$(tc-getCC) -std=gnu17" \
                LIBDIR="/usr/$(get_libdir)/bcc" \
                INCLDIR="/usr/$(get_libdir)/bcc" \
                all
-
-       export PATH=${S}/bin:${PATH}
-
-       cd bootblocks || die
-       emake \
-               HOSTCC="$(tc-getCC)"
-
+       emake -j1 \
+               CC="$(tc-getCC) -std=gnu17" \
+               LIBDIR="/usr/$(get_libdir)/bcc" \
+               INCLDIR="/usr/$(get_libdir)/bcc" \
+               bootblocks
 }
 
 src_install() {

Reply via email to