fish: reenable posix_spawn().

This commit is contained in:
Jerome Duval
2017-11-04 18:05:29 +01:00
parent 94b8ea2d2c
commit 4b9d179424
2 changed files with 2 additions and 27 deletions

View File

@@ -5,7 +5,7 @@ is simple but incompatible with other shell languages."
HOMEPAGE="http://ridiculousfish.com/shell/"
COPYRIGHT="2005-2017 Axel Liljencrantz"
LICENSE="GNU GPL v2"
REVISION="3"
REVISION="4"
SOURCE_URI="https://github.com/fish-shell/fish-shell/releases/download/$portVersion/fish-$portVersion.tar.gz"
CHECKSUM_SHA256="7ee5bbd671c73e5323778982109241685d58a836e52013e18ee5d9f2e638fdfb"
SOURCE_DIR="fish-$portVersion"
@@ -34,7 +34,7 @@ REQUIRES="
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
haiku${secondaryArchSuffix}_devel >= r1~alpha4_pm_hrev51519-1
devel:libexecinfo$secondaryArchSuffix
devel:libgettextlib$secondaryArchSuffix
devel:libiconv$secondaryArchSuffix

View File

@@ -101,28 +101,3 @@ index 96d6d29..df4262e 100644
2.14.2
From 4669c6a01b11698c48b299de62105059bd539a03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Tue, 31 Oct 2017 08:25:27 +0100
Subject: Posix_spawn is broken on Haiku.
diff --git a/src/postfork.h b/src/postfork.h
index 0a82a45..d441fe9 100644
--- a/src/postfork.h
+++ b/src/postfork.h
@@ -10,9 +10,11 @@
#if HAVE_SPAWN_H
#include <spawn.h>
#endif
+#ifndef __HAIKU__
#ifndef FISH_USE_POSIX_SPAWN
#define FISH_USE_POSIX_SPAWN HAVE_SPAWN_H
#endif
+#endif
class io_chain_t;
class job_t;
--
2.14.2