mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-08 21:00:05 +02:00
66 lines
2.3 KiB
Plaintext
66 lines
2.3 KiB
Plaintext
From 761a401896e1ea6b56c88e36a031e2391ac697e1 Mon Sep 17 00:00:00 2001
|
|
From: Schrijvers Luc <begasus@gmail.com>
|
|
Date: Thu, 2 Jan 2025 15:49:13 +0100
|
|
Subject: Applying old patches
|
|
|
|
|
|
diff --git a/Project/GNU/Library/configure.ac b/Project/GNU/Library/configure.ac
|
|
index 6c4b4ff..65d52d4 100644
|
|
--- a/Project/GNU/Library/configure.ac
|
|
+++ b/Project/GNU/Library/configure.ac
|
|
@@ -144,10 +144,10 @@ dnl -------------------------------------------------------------------------
|
|
dnl Common
|
|
dnl
|
|
if test "$enable_shared" = "yes"; then
|
|
- ZenLib_LIBS="-L$(pwd)/.libs -lzen -lpthread $ZenLib_LIBS"
|
|
+ ZenLib_LIBS="-L$(pwd)/.libs -lzen $ZenLib_LIBS"
|
|
fi
|
|
if test "$enable_static" = "yes"; then
|
|
- ZenLib_LIBS_Static="$(pwd)/.libs/libzen.a -lpthread $ZenLib_LIBS_Static"
|
|
+ ZenLib_LIBS_Static="$(pwd)/.libs/libzen.a $ZenLib_LIBS_Static"
|
|
fi
|
|
|
|
dnl #########################################################################
|
|
@@ -259,7 +259,7 @@ fi
|
|
dnl -------------------------------------------------------------------------
|
|
dnl External libs
|
|
dnl
|
|
-LDFLAGS="$LDFLAGS -lpthread"
|
|
+LDFLAGS="$LDFLAGS"
|
|
|
|
dnl -------------------------------------------------------------------------
|
|
dnl Check if thread safe variants of time functions are available
|
|
diff --git a/Project/GNU/Library/libzen.pc.in b/Project/GNU/Library/libzen.pc.in
|
|
index f7bb814..3e9dfa7 100644
|
|
--- a/Project/GNU/Library/libzen.pc.in
|
|
+++ b/Project/GNU/Library/libzen.pc.in
|
|
@@ -4,10 +4,10 @@ libdir=@libdir@
|
|
includedir=@includedir@
|
|
Unicode=@ZenLib_Unicode@
|
|
WstringMissing=@ZenLib_wstring_missing@
|
|
-Libs_Static=@libdir@/libzen.a -lpthread
|
|
+Libs_Static=@libdir@/libzen.a
|
|
|
|
Name: libzen
|
|
Version: @PACKAGE_VERSION@
|
|
Description: ZenLib
|
|
-Libs: -L${libdir} -lzen -lpthread
|
|
+Libs: -L${libdir} -lzen
|
|
Cflags: -I${includedir} @ZenLib_CXXFLAGS@
|
|
diff --git a/Source/ZenLib/Conf.h b/Source/ZenLib/Conf.h
|
|
index 18264cf..0a7426b 100644
|
|
--- a/Source/ZenLib/Conf.h
|
|
+++ b/Source/ZenLib/Conf.h
|
|
@@ -71,7 +71,7 @@
|
|
|| defined(__unix) || defined(__unix__) \
|
|
|| defined(____SVR4____) || defined(__LINUX__) || defined(__sgi) \
|
|
|| defined(__hpux) || defined(sun) || defined(__SUN__) || defined(_AIX) \
|
|
- || defined(__EMX__) || defined(__VMS) || defined(__BEOS__)
|
|
+ || defined(__EMX__) || defined(__VMS) || defined(__BEOS__) || defined(__HAIKU__)
|
|
#ifndef UNIX
|
|
#define UNIX
|
|
#endif
|
|
--
|
|
2.45.2
|
|
|