haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

guile, remove static libraries, switch SOURCE_URI, fix build (#7624)

Browse Source
This commit is contained in:
Schrijvers Luc
2022-12-26 09:07:29 +01:00
committed by GitHub
parent ae8b95c568
commit 978944a696
3 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dev-scheme/guile/guile-2.2.7.recipe
View File

@@ -7,13 +7,13 @@ the same) and users to use them to have an application fit their needs."
HOMEPAGE="https://www.gnu.org/software/guile/"
COPYRIGHT="1993-2020 Aubrey Jaffer, George Carrette, et al."
LICENSE="GNU LGPL v3"
REVISION="4"
SOURCE_URI="https://ftpmirror.gnu.org/guile/guile-$portVersion.tar.lz
https://ftp.gnu.org/gnu/guile/guile-$portVersion.tar.lz"
CHECKSUM_SHA256="5de7c4d28fa25c232512a4d1e76e6152a721dde568a6b1310971e1ea49e18c46"
REVISION="5"
SOURCE_URI="https://ftpmirror.gnu.org/guile/guile-$portVersion.tar.gz
https://ftp.gnu.org/gnu/guile/guile-$portVersion.tar.gz"
CHECKSUM_SHA256="44b4c5fbbe257ccdebea18420212c9b3e90c3c86a54920d8554039fc6769a007"
PATCHES="guile-$portVersion.patchset"
ARCHITECTURES="all !x86_gcc2 ?x86"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
commandSuffix=$secondaryArchSuffix
@@ -107,7 +107,8 @@ BUILD()
CPPFLAGS="-D_BSD_SOURCE" LIBS="-lbsd -lnetwork" \
runConfigure --omit-dirs binDir ./configure\
--bindir=$commandBinDir\
--with-threads
--with-threads \
--disable-static
# No MADV_DONTNEED, yet
sed --in-place '/HAVE_SYS_MMAN_H/d' config.h

7
dev-scheme/guile/guile1-1.8.8.recipe
View File

@@ -7,14 +7,14 @@ the same) and users to use them to have an application fit their needs."
HOMEPAGE="https://www.gnu.org/software/guile/"
COPYRIGHT="1993-2018 Aubrey Jaffer, George Carrette, et al."
LICENSE="GNU LGPL v3"
REVISION="3"
REVISION="4"
SOURCE_URI="https://ftpmirror.gnu.org/guile/guile-$portVersion.tar.gz
https://ftp.gnu.org/gnu/guile/guile-$portVersion.tar.gz"
CHECKSUM_SHA256="c3471fed2e72e5b04ad133bbaaf16369e8360283679bcf19800bc1b381024050"
PATCHES="guile1-$portVersion.patchset"
SOURCE_DIR="guile-$portVersion"
ARCHITECTURES="all !x86_gcc2 ?x86"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
commandSuffix=$secondaryArchSuffix
@@ -120,7 +120,8 @@ BUILD()
runConfigure --omit-dirs binDir ./configure \
--bindir=$commandBinDir \
--with-threads \
--disable-error-on-warning
--disable-error-on-warning \
--disable-static
# No MADV_DONTNEED, yet
sed --in-place '/HAVE_SYS_MMAN_H/d' config.h

27
dev-scheme/guile/patches/guile1-1.8.8.patchset
View File

@@ -55,3 +55,30 @@ index 2ecd8ae..fdaaad9 100644
--
2.24.1
From 255c61ebe04c52c6ca24b1ace370eb34120e2555 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sat, 24 Dec 2022 10:59:32 +0000
Subject: build fix
diff --git a/libguile/filesys.c b/libguile/filesys.c
index c8acb13..af2f4b6 100644
--- a/libguile/filesys.c
+++ b/libguile/filesys.c
@@ -905,9 +905,12 @@ SCM_DEFINE (scm_readdir, "readdir", 1, 0, 0,
struct dirent_or_dirent64 de; /* just for sizeof */
DIR *ds = (DIR *) SCM_CELL_WORD_1 (port);
size_t namlen;
-#ifdef NAME_MAX
+#if defined(NAME_MAX) && !defined(__HAIKU__)
char buf [SCM_MAX (sizeof (de),
sizeof (de) - sizeof (de.d_name) + NAME_MAX + 1)];
+#elif defined(__HAIKU__)
+ char buf [SCM_MAX (sizeof (de),
+ sizeof (de) + NAME_MAX + 1)];
#else
char *buf;
long name_max = fpathconf (dirfd (ds), _PC_NAME_MAX);
--
2.37.3