fpc: link against libiconv (#7799)

This commit is contained in:
hfsfox
2023-01-24 14:30:51 +02:00
committed by GitHub
parent 6a73b82b75
commit 6636b016b9
2 changed files with 42 additions and 1 deletions

View File

@@ -0,0 +1,38 @@
From b26e59fd8a486ede17adfde5f63d6a8939abaf60 Mon Sep 17 00:00:00 2001
From: hfsfox <darkkitsunezx128k2309@gmail.com>
Date: Tue, 24 Jan 2023 02:21:42 +0200
Subject: libiconv and libGLU fix
diff --git a/fpcsrc/packages/opengl/src/glu.pp b/fpcsrc/packages/opengl/src/glu.pp
index 3d79616..534a3da 100644
--- a/fpcsrc/packages/opengl/src/glu.pp
+++ b/fpcsrc/packages/opengl/src/glu.pp
@@ -73,8 +73,10 @@ Const
GLU_Lib = 'opengl.dll';
{$elseif defined(darwin)}
GLU_LIB = '/System/Library/Frameworks/OpenGL.framework/Libraries/libGLU.dylib';
-{$elseif defined(haiku) or defined(OpenBSD)}
+{$elseif defined(OpenBSD)}
GLU_LIB = 'libGLU.so';
+{ $elseif defined(haiku)}
+ GLU_LIB = 'libGLU.so.1';
{$elseif defined(MorphOS)}
GLU_LIB = 'tinygl.library';
{$else}
diff --git a/fpcsrc/rtl/unix/cwstring.pp b/fpcsrc/rtl/unix/cwstring.pp
index 688bc55..ba832af 100644
--- a/fpcsrc/rtl/unix/cwstring.pp
+++ b/fpcsrc/rtl/unix/cwstring.pp
@@ -64,7 +64,7 @@ Const
libprefix='lib';
{$else}
{$ifdef haiku}
- libiconvname='textencoding'; // is in libtextencoding under Haiku
+ libiconvname='libiconv'; // is in libtextencoding under Haiku
libprefix='lib';
{$else}
{$if defined(darwin) or defined(aix)}
--
2.37.3