mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
dev-lisp/clisp: fix build issue on musl
patch from upstream Thanks-to: Tom Gillespie <tgbugs@gmail.com> Closes: https://bugs.gentoo.org/957726 Signed-off-by: Z. Liu <zhixu.liu@gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/42539 Closes: https://github.com/gentoo/gentoo/pull/42539 Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
@@ -48,6 +48,7 @@ BDEPEND="X? ( x11-misc/imake )"
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-after_glibc_cfree_bdb.patch
|
||||
"${FILESDIR}"/${P}-gdbm_and_bdb5.3.patch
|
||||
"${FILESDIR}"/${P}-build-Build-genclx-without-gnulib.patch
|
||||
)
|
||||
|
||||
BUILDDIR="builddir"
|
||||
@@ -0,0 +1,52 @@
|
||||
From 766baa4f47b59b70c9d865786182c16dc93aafe6 Mon Sep 17 00:00:00 2001
|
||||
From: Bruno Haible <bruno@clisp.org>
|
||||
Date: Sat, 9 Nov 2024 12:57:02 +0100
|
||||
Subject: [PATCH] build: Build genclx without gnulib.
|
||||
|
||||
Reported by Peter Van Eynde in
|
||||
<https://gitlab.com/gnu-clisp/clisp/-/issues/53>.
|
||||
|
||||
* modules/clx/new-clx/Makefile.in (BUILD_CC, BUILD_CPPFLAGS, BUILD_CFLAGS,
|
||||
BUILD_LDFLAGS): New variables.
|
||||
(clx.d): Use them to compile genclx.c.
|
||||
|
||||
diff --git a/modules/clx/new-clx/Makefile.in b/modules/clx/new-clx/Makefile.in
|
||||
index 7b0056ad0..600f2752b 100644
|
||||
--- a/modules/clx/new-clx/Makefile.in
|
||||
+++ b/modules/clx/new-clx/Makefile.in
|
||||
@@ -1,11 +1,22 @@
|
||||
-# Makefile for CLISP module set clx
|
||||
+# Makefile for CLISP module set new-clx
|
||||
|
||||
srcdir = @srcdir@
|
||||
+
|
||||
+# These variables are used to build binaries for the build platform,
|
||||
+# that are not linked to Gnulib or CLISP code.
|
||||
+BUILD_CC = @CC@
|
||||
+BUILD_CPPFLAGS = @CPPFLAGS@
|
||||
+BUILD_CFLAGS = @CFLAGS@
|
||||
+BUILD_LDFLAGS = @LDFLAGS@
|
||||
+
|
||||
+# These variables are used to build binaries for the target platform.
|
||||
+# They are set through link.sh (invoked from clisp-link).
|
||||
CC = @CC@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CFLAGS = -O
|
||||
CLISP = @CLISP@ -norc -q
|
||||
CLISP_LINKKIT = @CLISP_LINKKIT@
|
||||
+
|
||||
LN = @LN@
|
||||
LN_S = @LN_S@
|
||||
SHELL = /bin/sh
|
||||
@@ -35,7 +46,7 @@ resource.fas: $(srcdir)/resource.lisp clx.lib
|
||||
|
||||
clx.d: $(srcdir)/clx.f
|
||||
$(CCMP2C) $(srcdir)/clx.f > genclx.c
|
||||
- $(CC) $(CPPFLAGS) $(CFLAGS) $(WANTS) genclx.c -o genclx
|
||||
+ $(BUILD_CC) $(BUILD_CPPFLAGS) $(WANTS) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) -o genclx genclx.c
|
||||
./genclx -l -o clx.d > clx.d
|
||||
$(RM) genclx.c
|
||||
$(RM) genclx
|
||||
--
|
||||
2.45.2
|
||||
|
||||
Reference in New Issue
Block a user