mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-16 16:50:06 +02:00
117 lines
3.0 KiB
Plaintext
117 lines
3.0 KiB
Plaintext
From ff0c8a322c31cbd0f7140bce8bed5af23a797bce Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Sat, 15 Jul 2017 13:50:02 +0200
|
|
Subject: apply 1.5.2 patch.
|
|
|
|
|
|
diff --git a/config.layout b/config.layout
|
|
index fb087a8..a599e0d 100644
|
|
--- a/config.layout
|
|
+++ b/config.layout
|
|
@@ -60,6 +60,23 @@
|
|
runtimedir: ${localstatedir}/run
|
|
</Layout>
|
|
|
|
+# Haiku Layout making use of finddir
|
|
+<Layout haiku>
|
|
+ prefix: /boot/system
|
|
+ exec_prefix: /boot/system
|
|
+ bindir: /boot/system/bin
|
|
+ sbindir: /boot/system/servers
|
|
+ libdir: /boot/system/lib
|
|
+ libexecdir: /boot/system/servers
|
|
+ mandir: /boot/system/documentation/man
|
|
+ sysconfdir: /boot/system/settings
|
|
+ datadir: /boot/system/data
|
|
+ installbuilddir: /boot/develop/build
|
|
+ includedir: /boot/system/include
|
|
+ localstatedir: /boot/system/var
|
|
+ runtimedir: ${localstatedir}/log
|
|
+</Layout>
|
|
+
|
|
# Mac OS X Server (Rhapsody)
|
|
<Layout Mac OS X Server>
|
|
prefix: /Local/Library/WebServer
|
|
diff --git a/configure.in b/configure.in
|
|
index ff92e55..957dbf7 100644
|
|
--- a/configure.in
|
|
+++ b/configure.in
|
|
@@ -880,9 +880,9 @@ case $host in
|
|
ac_cv_func_CreateFileMapping=yes
|
|
;;
|
|
*)
|
|
+ AC_SEARCH_LIBS(socket, socket network)
|
|
AC_SEARCH_LIBS(gethostbyname, nsl)
|
|
AC_SEARCH_LIBS(gethostname, nsl)
|
|
- AC_SEARCH_LIBS(socket, socket)
|
|
AC_SEARCH_LIBS(crypt, crypt ufc)
|
|
AC_CHECK_LIB(truerand, main)
|
|
AC_SEARCH_LIBS(modf, m)
|
|
--
|
|
2.37.3
|
|
|
|
|
|
From fd46bb90ed37f36f6e1923ec13092615fcab6a01 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Mon, 25 Apr 2022 21:18:48 +0200
|
|
Subject: Haiku: decide to use standard POSIX methods
|
|
|
|
|
|
diff --git a/configure.in b/configure.in
|
|
index 957dbf7..3adc0c2 100644
|
|
--- a/configure.in
|
|
+++ b/configure.in
|
|
@@ -1401,6 +1401,9 @@ case $host in
|
|
APR_DECISION_OVERRIDE(USE_SHMEM_MMAP_ZERO USE_SHMEM_SHMGET_ANON)
|
|
fi
|
|
;;
|
|
+ *haiku* )
|
|
+ APR_DECISION_OVERRIDE(USE_SHMEM_MMAP_ANON)
|
|
+ ;;
|
|
*hpux11* )
|
|
APR_DECISION_OVERRIDE(USE_SHMEM_SHMGET_ANON)
|
|
;;
|
|
@@ -2548,6 +2551,11 @@ esac
|
|
if test "x$apr_lock_method" != "x"; then
|
|
APR_DECISION_FORCE($apr_lock_method)
|
|
fi
|
|
+case $host in
|
|
+ *haiku* )
|
|
+ APR_DECISION_OVERRIDE(USE_SYSVSEM_SERIALIZE)
|
|
+ ;;
|
|
+esac
|
|
APR_END_DECISION
|
|
AC_DEFINE_UNQUOTED($ac_decision)
|
|
|
|
--
|
|
2.37.3
|
|
|
|
|
|
From a74ca483388d315af1ea921baac260ebb54ccd18 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Tue, 26 Apr 2022 14:42:58 +0200
|
|
Subject: fix checking if fcntl returns EACCES when F_SETLK is already held
|
|
|
|
|
|
diff --git a/configure.in b/configure.in
|
|
index 3adc0c2..dc1f3d1 100644
|
|
--- a/configure.in
|
|
+++ b/configure.in
|
|
@@ -2637,11 +2637,11 @@ int main()
|
|
wait(&status);
|
|
}
|
|
else {
|
|
- return(lockit());
|
|
+ return (lockit() != EACCES ? 1 : 0);
|
|
}
|
|
|
|
close(fd);
|
|
- exit(WEXITSTATUS(status) != EACCES);
|
|
+ exit(WEXITSTATUS(status));
|
|
}
|
|
|
|
int lockit() {
|
|
--
|
|
2.37.3
|
|
|