mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
fpc: link against libiconv (#7799)
This commit is contained in:
@@ -11,13 +11,14 @@ HOMEPAGE="https://freepascal.org/"
|
||||
COPYRIGHT="1993-2021 Florian Klaempfl and others"
|
||||
LICENSE="GNU LGPL v3
|
||||
GNU GPL v3"
|
||||
REVISION="1"
|
||||
REVISION="2"
|
||||
SOURCE_URI="https://downloads.sourceforge.net/freepascal/fpcbuild-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="85ef993043bb83f999e2212f1bca766eb71f6f973d362e2290475dbaaf50161f"
|
||||
SOURCE_URI_2="https://sourceforge.net/projects/freepascal/files/Documentation/$portVersion/doc-pdf.tar.gz#noarchive"
|
||||
CHECKSUM_SHA256_2="4dccbd4210995a94b76d1624a796c0abcf5118c0b92c487ab35a9d5a8bc68138"
|
||||
SOURCE_FILENAME_2="doc-pdf-$portVersion.tar.gz"
|
||||
SOURCE_DIR="fpcbuild-$portVersion"
|
||||
PATCHES="fpc-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all ?x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
@@ -105,6 +106,7 @@ fi
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libncurses$secondaryArchSuffix >= 6.0
|
||||
lib:libiconv$secondaryArchSuffix
|
||||
"
|
||||
PROVIDES_examples="
|
||||
fpc${secondaryArchSuffix}_examples
|
||||
@@ -115,6 +117,7 @@ REQUIRES_examples="
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libiconv$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
binutils$secondaryArchSuffix
|
||||
|
||||
38
dev-lang/fpc/patches/fpc-3.2.2.patchset
Normal file
38
dev-lang/fpc/patches/fpc-3.2.2.patchset
Normal 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
|
||||
|
||||
Reference in New Issue
Block a user