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

erlang, revbump for openssl3 (#11043)

Browse Source
This commit is contained in:
Schrijvers Luc
2024-09-02 20:34:28 +02:00
committed by GitHub
parent d8bb561bb8
commit 578732d22d
2 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dev-lang/erlang/erlang-20.1.recipe
View File

@@ -7,7 +7,7 @@ concurrency, distribution and fault tolerance."
HOMEPAGE="https://www.erlang.org/"
COPYRIGHT="1997-2017 Ericsson AB"
LICENSE="EPL"
REVISION="3"
REVISION="4"
SOURCE_URI="http://www.erlang.org/download/otp_src_$portVersion.tar.gz"
CHECKSUM_SHA256="900d35eb563607785a8e27f4b4c03cf6c98b4596028c5d6958569ddde5d4ddbf"
SOURCE_DIR="otp_src_$portVersion"
@@ -42,11 +42,11 @@ REQUIRES="
BUILD_REQUIRES="
haiku_devel
devel:libcrypto
devel:libgl
devel:libglu
devel:libcrypto >= 3
devel:libGL
devel:libGLU
devel:libncurses
devel:libssl
devel:libssl >= 3
devel:libz
"
BUILD_PREREQUIRES="

39
dev-lang/erlang/patches/erlang-20.1.patchset
View File

@@ -1,4 +1,4 @@
From d813e6dd2e97d49b862b972ddc8bdeceaa89b69e Mon Sep 17 00:00:00 2001
From 3a5f732fc235665aa43ca0396113f1a5d280ed96 Mon Sep 17 00:00:00 2001
From: Calvin Hill <calvin@hakobaito.co.uk>
Date: Mon, 27 Feb 2017 14:21:40 +0000
Subject: Haiku fixes
@@ -144,10 +144,10 @@ index ea9ecb3..6020fd6 100644
{
struct {
--
2.14.2
2.45.2
From f13ad75bd0cac454b7b4dc208eca4b9454fcd511 Mon Sep 17 00:00:00 2001
From 4d2e740c425b29f1d04d0b7d45b34b69dd93bd7d Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sun, 8 Oct 2017 22:34:10 +0200
Subject: avoid using false, which we define.
@@ -206,10 +206,10 @@ index 2a508b0..f0d7657 100644
driver_free(env);
if (capbuf)
--
2.14.2
2.45.2
From fdcf91292b46f6778353f540a3d9894b462bfcec Mon Sep 17 00:00:00 2001
From 01c18dc6a250aa7439737ee395ae23e5567de216 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 6 Nov 2017 22:47:39 +0100
Subject: setrlimit for RLIMIT_STACK fails on Haiku.
@@ -229,10 +229,10 @@ index 5206d75..6e305dd 100644
int bytes;
stacksize = erts_sched_thread_suggested_stack_size * sizeof(Uint) * 1024;
--
2.14.2
2.45.2
From ce126fcf57777b6dc5dc1382346a20fc5f795d8e Mon Sep 17 00:00:00 2001
From 4ec3954195f398447b1a16af2e6e620461decd19 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 6 Nov 2017 22:49:51 +0100
Subject: reset configure
@@ -254,5 +254,28 @@ index e37bf70..6eae9ed 100755
fi;;
--
2.14.2
2.45.2
From 665c0ef6d358eaaf8db6fb543811971c0a72d487 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Mon, 2 Sep 2024 19:22:08 +0200
Subject: Fix multiple definitions errors
diff --git a/erts/emulator/beam/erl_alloc.h b/erts/emulator/beam/erl_alloc.h
index 97a1cf1..41d74ac 100644
--- a/erts/emulator/beam/erl_alloc.h
+++ b/erts/emulator/beam/erl_alloc.h
@@ -146,7 +146,7 @@ typedef struct ErtsAllocatorWrapper_t_ {
void (*unlock)(void);
struct ErtsAllocatorWrapper_t_* next;
}ErtsAllocatorWrapper_t;
-ErtsAllocatorWrapper_t *erts_allctr_wrappers;
+extern ErtsAllocatorWrapper_t *erts_allctr_wrappers;
extern int erts_allctr_wrapper_prelocked;
extern erts_tsd_key_t erts_allctr_prelock_tsd_key;
void erts_allctr_wrapper_prelock_init(ErtsAllocatorWrapper_t* wrapper);
--
2.45.2