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

chicken, bump version, cleanup (#7430)

Browse Source
This commit is contained in:
Schrijvers Luc
2022-11-20 14:47:43 +01:00
committed by GitHub
parent c0148aa762
commit 9ed1c63963
3 changed files with 15 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
dev-scheme/chicken/chicken-4.8.0.5.recipe
View File

@@ -1,103 +0,0 @@
SUMMARY="A Scheme interpreter and native Scheme to C compiler"
DESCRIPTION="
CHICKEN is a compiler for the Scheme programming language. CHICKEN produces \
portable and efficient C, supports almost all of the R5RS Scheme language \
standard, and includes many enhancements and extensions. CHICKEN runs on \
Linux, MacOS X, Windows, and many Unix flavours.
"
HOMEPAGE="http://www.call-cc.org/"
COPYRIGHT="2008-2013 The Chicken Team
2000-2007 Felix L. Winkelmann"
LICENSE="BSD (2-clause)"
REVISION="1"
SOURCE_URI="http://code.call-cc.org/releases/4.8.0/chicken-4.8.0.5.tar.gz"
CHECKSUM_SHA256="5b9192951bc61cc19dd4963cceb93908bff46b6868d7927f19850e8973c430fb"
PATCHES="chicken-4.8.0.5.patchset"
ARCHITECTURES="?x86 ?x86_gcc2"
GLOBAL_WRITABLE_FILES="
non-packaged/lib/chicken/6 directory keep-old
"
PROVIDES="
chicken = $portVersion compat >= 4.8
cmd:chicken = $portVersion compat >= 4.8
cmd:chicken_bug = $portVersion compat >= 4.8
cmd:chicken_install = $portVersion compat >= 4.8
cmd:chicken_profile = $portVersion compat >= 4.8
cmd:chicken_status = $portVersion compat >= 4.8
cmd:chicken_uninstall = $portVersion compat >= 4.8
cmd:csc = $portVersion compat >= 4.8
cmd:csi = $portVersion compat >= 4.8
lib:libchicken = $portVersion compat >= 4.8
"
REQUIRES="
haiku
cmd:gcc
cmd:ld
"
PROVIDES_devel="
chicken_devel = $portVersion
devel:libchicken = $portVersion
"
REQUIRES_devel="
chicken == $portVersion
"
BUILD_REQUIRES="
"
BUILD_PREREQUIRES="
haiku_devel
cmd:gcc
cmd:ld
cmd:make
"
PATCH()
{
if [ "$targetArchitecture" = x86_gcc2 ]; then
echo "Removing -fwrapv flag for gcc2 build"
sed -i 's/-fwrapv//' Makefile.haiku
fi
echo "Removing git check"
sed -i 's/sh $(SRCDIR)identify.sh/echo/' rules.make
}
BUILD()
{
# odd timestamp issue
touch build-version.c
make PLATFORM=haiku PREFIX=$prefix \
MANDIR=$manDir/man1 \
DOCDIR=$docDir \
DATADIR=$dataDir/chicken \
INCDIR=$includeDir/chicken \
HOSTNAME=shredder
}
INSTALL()
{
make install PLATFORM=haiku PREFIX=$prefix \
MANDIR=$manDir/man1 \
DOCDIR=$docDir \
DATADIR=$dataDir/chicken \
INCDIR=$includeDir/chicken \
HOSTNAME=shredder
prepareInstalledDevelLibs libchicken
packageEntries devel $developDir
rm -rf $prefix/share
}
TEST()
{
if ! type -p csi > /dev/null;then
echo "ERROR: Chicken must be installed before running the test suite"
exit 1
fi
make PLATFORM=haiku PREFIX=$prefix check
}

29
dev-scheme/chicken/chicken-4.13.0.recipe → dev-scheme/chicken/chicken-5.3.0.recipe
View File

@@ -4,14 +4,14 @@ CHICKEN produces portable and efficient C, supports almost all of the R5RS \
Scheme language standard, and includes many enhancements and extensions. \
CHICKEN runs on Linux, MacOS X, Windows, and many Unix flavours."
HOMEPAGE="http://www.call-cc.org/"
COPYRIGHT="2008-2017 The Chicken Team
COPYRIGHT="2008-2020 The Chicken Team
2000-2007 Felix L. Winkelmann"
LICENSE="BSD (2-clause)"
REVISION="1"
SOURCE_URI="http://code.call-cc.org/releases/$portVersion/chicken-$portVersion.tar.gz"
CHECKSUM_SHA256="add549619a31363d6608b39e0cf0e68b9d5e6ff2a719b5691ddeba57229c6c43"
CHECKSUM_SHA256="c3ad99d8f9e17ed810912ef981ac3b0c2e2f46fb0ecc033b5c3b6dca1bdb0d76"
ARCHITECTURES="?all !x86_gcc2 x86"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
# On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
@@ -23,7 +23,7 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
fi
GLOBAL_WRITABLE_FILES="
non-packaged/lib/chicken/8 directory keep-old
non-packaged/lib/chicken/11 directory keep-old
"
PROVIDES="
@@ -31,13 +31,13 @@ PROVIDES="
cmd:csi$commandSuffix = $portVersion
cmd:csc$commandSuffix = $portVersion
cmd:chicken$commandSuffix = $portVersion
cmd:chicken_bug$commandSuffix
cmd:chicken_install$commandSuffix
cmd:chicken_install$commandSuffix = $portVersion
cmd:chicken_profile$commandSuffix = $portVersion
cmd:chicken_status$commandSuffix
cmd:chicken_uninstall$commandSuffix
cmd:feathers$commandSuffix
lib:libchicken$secondaryArchSuffix = 8 compat >= 8
cmd:chicken_status$commandSuffix = $portVersion
cmd:chicken_uninstall$commandSuffix = $portVersion
cmd:chicken_do$commandSuffix = $portVersion
cmd:feathers$commandSuffix = $portVersion
lib:libchicken$secondaryArchSuffix = 11 compat >= 11
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -45,7 +45,7 @@ REQUIRES="
PROVIDES_devel="
chicken${secondaryArchSuffix}_devel = $portVersion
devel:libchicken$secondaryArchSuffix = 8 compat >= 8
devel:libchicken$secondaryArchSuffix = 11 compat >= 11
"
REQUIRES_devel="
chicken$secondaryArchSuffix == $portVersion base
@@ -55,6 +55,7 @@ BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
"
BUILD_PREREQUIRES="
cmd:chicken
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
@@ -79,7 +80,7 @@ BUILD()
# odd timestamp issue
touch build-version.c
make $jobArgs PLATFORM=haiku \
make PLATFORM=haiku \
PREFIX=$prefix \
BINDIR=$commandBinDir \
LIBDIR=$libDir \
@@ -87,13 +88,13 @@ BUILD()
MANDIR=$manDir \
DOCDIR=$docDir \
INCLUDEDIR=$includeDir \
EGGDIR=$prefix/non-packaged/lib/chicken/8 \
EGGDIR=$prefix/non-packaged/lib/chicken/11 \
HOSTNAME=shredder
}
INSTALL()
{
mkdir -p $prefix/non-packaged/lib/chicken/8
mkdir -p $prefix/non-packaged/lib/chicken/11
make install PLATFORM=haiku \
PREFIX=$prefix \

109
dev-scheme/chicken/patches/chicken-4.8.0.5.patchset
View File

@@ -1,109 +0,0 @@
From a74b33e6d278ad461c2eba2991e09cf54a1e4d72 Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Thu, 7 Nov 2013 02:07:02 -0700
Subject: Minor fixes
diff --git a/chicken.h b/chicken.h
index de48141..98f7071 100644
--- a/chicken.h
+++ b/chicken.h
@@ -2888,7 +2888,7 @@ C_path_to_executable(C_char *fname)
while (get_next_image_info(0, &cookie, &info) == B_OK) {
if (info.type == B_APP_IMAGE) {
- C_strcat(buffer, info.name);
+ C_strcpy(buffer, info.name);
for(i = C_strlen(buffer); i >= 0 && buffer[ i ] != '/'; --i);
diff --git a/library.c b/library.c
index b54b578..fedf35b 100644
--- a/library.c
+++ b/library.c
@@ -79,13 +79,14 @@ fast_read_line_from_file(C_word str, C_word port, C_word size) {
static C_word
fast_read_string_from_file(C_word dest, C_word port, C_word len, C_word pos)
{
+ size_t m;
int n = C_unfix (len);
char * buf = ((char *)C_data_pointer (dest) + C_unfix (pos));
C_FILEPTR fp = C_port_file (port);
if(feof(fp)) return C_SCHEME_END_OF_FILE;
- size_t m = fread (buf, sizeof (char), n, fp);
+ m = fread (buf, sizeof (char), n, fp);
if (m < n) {
if (ferror(fp)) /* Report to Scheme, which may retry, so clear errors */
--
1.8.3.4
From ed8542b12f0695222d24261d2ad97853f3f19cb1 Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Thu, 7 Nov 2013 02:55:03 -0700
Subject: Adjust include path
diff --git a/Makefile.haiku b/Makefile.haiku
index 7489637..077daf2 100644
--- a/Makefile.haiku
+++ b/Makefile.haiku
@@ -64,6 +64,7 @@ include $(SRCDIR)/defaults.make
chicken-config.h: chicken-defaults.h
echo "/* GENERATED */" >$@
+ echo "#define C_TARGET_INCLUDE_HOME \"$(TARGET_PREFIX)/develop/headers/chicken\"" >>$@
echo "#define HAVE_DIRENT_H 1" >>$@
echo "#define HAVE_DLFCN_H 1" >>$@
echo "#define HAVE_INTTYPES_H 1" >>$@
--
1.8.3.4
From 04cdda51c590a1648c74be2565c29073f0c09562 Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Thu, 7 Nov 2013 03:04:04 -0700
Subject: Adjust develop library paths
diff --git a/Makefile.haiku b/Makefile.haiku
index 077daf2..6cab4fe 100644
--- a/Makefile.haiku
+++ b/Makefile.haiku
@@ -65,6 +65,8 @@ include $(SRCDIR)/defaults.make
chicken-config.h: chicken-defaults.h
echo "/* GENERATED */" >$@
echo "#define C_TARGET_INCLUDE_HOME \"$(TARGET_PREFIX)/develop/headers/chicken\"" >>$@
+ echo "#define C_TARGET_LIB_HOME \"$(TARGET_PREFIX)/develop/lib\"" >>$@
+ echo "#define C_TARGET_STATIC_LIB_HOME \"$(TARGET_PREFIX)/develop/lib\"" >>$@
echo "#define HAVE_DIRENT_H 1" >>$@
echo "#define HAVE_DLFCN_H 1" >>$@
echo "#define HAVE_INTTYPES_H 1" >>$@
--
1.8.3.4
From ed3a7c3bee260c4b09c4559b4a53ce346482ea1f Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Thu, 7 Nov 2013 03:33:47 -0700
Subject: Adjust egg location
diff --git a/Makefile.haiku b/Makefile.haiku
index 6cab4fe..c7c2824 100644
--- a/Makefile.haiku
+++ b/Makefile.haiku
@@ -67,6 +67,7 @@ chicken-config.h: chicken-defaults.h
echo "#define C_TARGET_INCLUDE_HOME \"$(TARGET_PREFIX)/develop/headers/chicken\"" >>$@
echo "#define C_TARGET_LIB_HOME \"$(TARGET_PREFIX)/develop/lib\"" >>$@
echo "#define C_TARGET_STATIC_LIB_HOME \"$(TARGET_PREFIX)/develop/lib\"" >>$@
+ echo "#define EGGDIR \"$(TARGET_PREFIX)/non-packaged/lib/chicken/$(BINARY_VERSION)\"" >>$@
echo "#define HAVE_DIRENT_H 1" >>$@
echo "#define HAVE_DLFCN_H 1" >>$@
echo "#define HAVE_INTTYPES_H 1" >>$@
--
1.8.3.4