mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-12 14:50:08 +02:00
93 lines
2.4 KiB
Plaintext
93 lines
2.4 KiB
Plaintext
From 47a2978d08244820cda369dddecb5af6afbfec12 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..4b354cb 100644
|
|
--- a/fpcsrc/rtl/unix/cwstring.pp
|
|
+++ b/fpcsrc/rtl/unix/cwstring.pp
|
|
@@ -39,11 +39,7 @@ implementation
|
|
{$endif}
|
|
|
|
{$ifndef iconv_is_in_libc}
|
|
- {$if defined(haiku)}
|
|
- {$linklib textencoding}
|
|
- {$else}
|
|
- {$linklib iconv}
|
|
- {$endif}
|
|
+ {$linklib iconv}
|
|
{$define useiconv}
|
|
{$endif not iconv_is_in_libc}
|
|
|
|
@@ -63,17 +59,12 @@ Const
|
|
libiconvname='c'; // is in libc under Linux.
|
|
libprefix='lib';
|
|
{$else}
|
|
- {$ifdef haiku}
|
|
- libiconvname='textencoding'; // is in libtextencoding under Haiku
|
|
- libprefix='lib';
|
|
+ {$if defined(darwin) or defined(aix)}
|
|
+ libiconvname='libiconv';
|
|
+ libprefix='';
|
|
{$else}
|
|
- {$if defined(darwin) or defined(aix)}
|
|
- libiconvname='libiconv';
|
|
- libprefix='';
|
|
- {$else}
|
|
- libiconvname='iconv';
|
|
- libprefix='lib';
|
|
- {$endif}
|
|
+ libiconvname='iconv';
|
|
+ libprefix='lib';
|
|
{$endif}
|
|
{$endif}
|
|
|
|
--
|
|
2.43.2
|
|
|
|
|
|
From a144085a561ea0aed5b58d4de9464fb0ff4f158b Mon Sep 17 00:00:00 2001
|
|
From: Piotr Halama <skrzynka@halamix2.pl>
|
|
Date: Sat, 24 Feb 2024 07:52:20 +0100
|
|
Subject: Fix path for /bin/sh
|
|
|
|
|
|
diff --git a/fpcsrc/compiler/cscript.pas b/fpcsrc/compiler/cscript.pas
|
|
index 0ecb4ef..1e57e88 100644
|
|
--- a/fpcsrc/compiler/cscript.pas
|
|
+++ b/fpcsrc/compiler/cscript.pas
|
|
@@ -396,11 +396,7 @@ Begin
|
|
AddStart('DoExitLink ()');
|
|
AddStart('{ echo "An error occurred while assembling $1"; exit 1; }');
|
|
AddStart('DoExitAsm ()');
|
|
- {$ifdef BEOS}
|
|
- AddStart('#!/boot/beos/bin/sh');
|
|
- {$else}
|
|
- AddStart('#!/bin/sh');
|
|
- {$endif}
|
|
+ AddStart('#!/bin/sh');
|
|
inherited WriteToDisk;
|
|
end;
|
|
|
|
--
|
|
2.43.2
|
|
|