haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-30 12:08:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #306 from miqlas/zsh_x86

Browse Source 
Updated zsh recipe to use the B_USER_SETTINGS_DIRECTORY
This commit is contained in:
diversys
2015-09-06 13:17:32 +03:00
parent 92f08aa55c 1143bc67e4
commit 6a37a950a0
2 changed files with 44 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app-shells/zsh/patches/zsh-5.0.7.patchset
View File

@@ -3,12 +3,11 @@ From: Chris Roberts <cpr420@gmail.com>
Date: Wed, 18 Sep 2013 03:11:28 -0600 Date: Wed, 18 Sep 2013 03:11:28 -0600
Subject: Fix for gcc2 Subject: Fix for gcc2
diff --git a/Src/params.c b/Src/params.c diff --git a/Src/params.c b/Src/params.c
index 8649178..3904ed0 100644 index 61edc5d..57e1e8d 100644
--- a/Src/params.c --- a/Src/params.c
+++ b/Src/params.c +++ b/Src/params.c
@@ -4310,7 +4310,7 @@ arrfixenv(char *s, char **t) @@ -4356,7 +4356,7 @@ arrfixenv(char *s, char **t)
int int
zputenv(char *str) zputenv(char *str)
{ {
@@ -17,6 +16,25 @@ index 8649178..3904ed0 100644
#ifdef USE_SET_UNSET_ENV #ifdef USE_SET_UNSET_ENV
/* /*
* If we are using unsetenv() to remove values from the * If we are using unsetenv() to remove values from the
-- diff --git a/configure.ac b/configure.ac
1.8.3.4 index 306a005..1dac756 100644
--- a/configure.ac
+++ b/configure.ac
@@ -752,7 +752,7 @@ dnl On ReliantUNIX -lc better be the last library, else funny things
dnl may happen.
AC_CHECK_LIB(c, printf, [LIBS="$LIBS -lc"])
-AC_CHECK_LIB(m, pow)
+AC_CHECK_LIB(root, pow)
AC_CHECK_LIB(rt, clock_gettime)
@@ -857,7 +857,7 @@ if test x$enable_cap = xyes; then
AC_CHECK_LIB(cap, cap_get_proc)
fi
-AC_CHECK_LIB(socket, socket)
+AC_CHECK_LIB(network, socket)
AC_SEARCH_LIBS(gethostbyname2, bind)
case $LIBS in

33
app-shells/zsh/zsh-5.0.7.recipe
View File

@@ -7,41 +7,48 @@ HOMEPAGE="http://www.zsh.org"
COPYRIGHT="1992-2014, Paul Falstad, Richard Coleman, Zoltán Hidvégi, \ COPYRIGHT="1992-2014, Paul Falstad, Richard Coleman, Zoltán Hidvégi, \
Andrew Main, Peter Stephenson, Sven Wishnowsky, and others" Andrew Main, Peter Stephenson, Sven Wishnowsky, and others"
LICENSE="ZSH" LICENSE="ZSH"
REVISION="1" REVISION="2"
SOURCE_URI="http://sourceforge.net/projects/zsh/files/zsh/$portVersion/zsh-$portVersion.tar.bz2" SOURCE_URI="http://sourceforge.net/projects/zsh/files/zsh/$portVersion/zsh-$portVersion.tar.bz2"
CHECKSUM_SHA256="544e27de81740286b916d1d77c9f48ad7c26ad7943ed96d278abee67cf6704b3" CHECKSUM_SHA256="544e27de81740286b916d1d77c9f48ad7c26ad7943ed96d278abee67cf6704b3"
PATCHES="zsh-$portVersion.patchset" PATCHES="zsh-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64" ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES=" PROVIDES="
zsh = $portVersion compat >= 5 zsh$secondaryArchSuffix = $portVersion compat >= 5
cmd:zsh = $portVersion compat >= 5 cmd:zsh$secondaryArchSuffix = $portVersion compat >= 5
cmd:zsh_$portVersion = $portVersion compat >= 5 cmd:zsh_$portVersion$secondaryArchSuffix = $portVersion compat >= 5
cmd:sh cmd:sh$secondaryArchSuffix
" "
REQUIRES=" REQUIRES="
haiku haiku$secondaryArchSuffix
lib:libncurses lib:libncurses$secondaryArchSuffix
lib:libpcre lib:libpcre$secondaryArchSuffix
lib:libiconv$secondaryArchSuffix
" "
BUILD_REQUIRES=" BUILD_REQUIRES="
haiku_devel haiku${secondaryArchSuffix}_devel
devel:libncurses devel:libncurses$secondaryArchSuffix
devel:libpcre devel:libpcre$secondaryArchSuffix
devel:libiconv$secondaryArchSuffix
" "
BUILD_PREREQUIRES=" BUILD_PREREQUIRES="
cmd:autoconf cmd:autoconf
cmd:find cmd:find
cmd:gcc cmd:gcc$secondaryArchSuffix
cmd:ld cmd:ld
cmd:make cmd:make
" "
BUILD() BUILD()
{ {
runConfigure ./configure autoreconf -fi
runConfigure ./configure \
--enable-zshrc=`finddir B_USER_SETTINGS_DIRECTORY`/zsh/.zshrc \
--sysconfdir=`finddir B_USER_SETTINGS_DIRECTORY`/zsh \
--enable-etcdir=`finddir B_USER_SETTINGS_DIRECTORY`/zsh
make $jobArgs make $jobArgs
} }