mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 04:00:05 +02:00
libedit: Update to 2015_03_21_3.1 to try and fix ssh build (didn't help)
This commit is contained in:
Alexander von Gluck IV
79
dev-libs/libedit/libedit-2015_03_21_3.1.recipe
Normal file
79
dev-libs/libedit/libedit-2015_03_21_3.1.recipe
Normal file
@@ -0,0 +1,79 @@
|
||||
SUMMARY="A BSD licensed replacement for the GNU readline library"
|
||||
DESCRIPTION="
|
||||
This is an autotool- and libtoolized port of the NetBSD Editline library \
|
||||
(libedit). This Berkeley-style licensed command line editor library provides \
|
||||
generic line editing, history, and tokenization functions, similar to those \
|
||||
found in GNU Readline.
|
||||
"
|
||||
LICENSE="BSD (3-clause)"
|
||||
COPYRIGHT="1992-2014 The NetBSD Foundation, Inc."
|
||||
HOMEPAGE="http://www.thrysoee.dk/editline/"
|
||||
SRC_URI="http://www.thrysoee.dk/editline/libedit-20150325-3.1.tar.gz"
|
||||
CHECKSUM_SHA256="c88a5e4af83c5f40dda8455886ac98923a9c33125699742603a88a0253fcc8c5"
|
||||
REVISION="1"
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
PATCHES="libedit-2015_03_25_3.1.patchset"
|
||||
|
||||
PROVIDES="
|
||||
libedit$secondaryArchSuffix = $portVersion
|
||||
lib:libedit$secondaryArchSuffix = 0.0.52 compat >= 0
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libncurses$secondaryArchSuffix
|
||||
"
|
||||
BUILD_REQUIRES="
|
||||
devel:libncurses$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
cmd:aclocal
|
||||
cmd:autoreconf
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:libtoolize
|
||||
cmd:make
|
||||
cmd:sed
|
||||
cmd:m4
|
||||
"
|
||||
|
||||
SOURCE_DIR="libedit-20150325-3.1"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
mkdir m4
|
||||
autoreconf --force --install
|
||||
runConfigure ./configure
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
|
||||
prepareInstalledDevelLibs libedit
|
||||
fixPkgconfig
|
||||
|
||||
# devel package
|
||||
packageEntries devel \
|
||||
$developDir \
|
||||
$manDir/man3
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
make check
|
||||
}
|
||||
|
||||
|
||||
# ----- devel package -------------------------------------------------------
|
||||
|
||||
PROVIDES_devel="
|
||||
libedit${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libedit$secondaryArchSuffix = 0.0.52 compat >= 0
|
||||
"
|
||||
REQUIRES_devel="
|
||||
libedit$secondaryArchSuffix == $portVersion base
|
||||
"
|
||||
73
dev-libs/libedit/patches/libedit-2015_03_25_3.1.patchset
Normal file
73
dev-libs/libedit/patches/libedit-2015_03_25_3.1.patchset
Normal file
@@ -0,0 +1,73 @@
|
||||
From 176329a96c16bf0508724fb05c1b3f8d6d6eab80 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Wed, 26 Nov 2014 16:48:13 +0000
|
||||
Subject: Haiku patch
|
||||
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 8524d41..cbef26d 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -78,7 +78,7 @@ AM_CONDITIONAL(ENABLE_EXAMPLES, [test "$enable_examples" = "yes"])
|
||||
AC_HEADER_DIRENT
|
||||
AC_HEADER_STDC
|
||||
AC_HEADER_SYS_WAIT
|
||||
-AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stdlib.h string.h sys/ioctl.h sys/param.h unistd.h curses.h ncurses.h sys/cdefs.h termcap.h])
|
||||
+AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stdint.h stdlib.h string.h sys/errno.h errno.h sys/ioctl.h sys/param.h unistd.h curses.h ncurses.h sys/cdefs.h langinfo.h])
|
||||
|
||||
AC_CHECK_HEADER([termios.h], [], [AC_MSG_ERROR([termios.h is required!])],[])
|
||||
|
||||
diff --git a/src/editline/readline.h b/src/editline/readline.h
|
||||
index 932febb..08650d6 100644
|
||||
--- a/src/editline/readline.h
|
||||
+++ b/src/editline/readline.h
|
||||
@@ -75,7 +75,7 @@ typedef KEYMAP_ENTRY *Keymap;
|
||||
|
||||
#ifndef CTRL
|
||||
#include <sys/ioctl.h>
|
||||
-#if !defined(__sun) && !defined(__hpux) && !defined(_AIX)
|
||||
+#if !defined(__sun) && !defined(__hpux) && !defined(_AIX) && !defined(__HAIKU__)
|
||||
#include <sys/ttydefaults.h>
|
||||
#endif
|
||||
#ifndef CTRL
|
||||
diff --git a/src/vis.c b/src/vis.c
|
||||
index d67f551..592f4a1 100644
|
||||
--- a/src/vis.c
|
||||
+++ b/src/vis.c
|
||||
@@ -75,6 +75,10 @@ __FBSDID("$FreeBSD$");
|
||||
#include <wchar.h>
|
||||
#include <wctype.h>
|
||||
|
||||
+#ifdef HAVE_STDINT_H
|
||||
+#include <stdint.h>
|
||||
+#endif
|
||||
+
|
||||
#ifdef __weak_alias
|
||||
__weak_alias(strvisx,_strvisx)
|
||||
#endif
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
|
||||
From f02342663ecd194b8e8811bf074014bd02e20836 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Wed, 26 Nov 2014 16:55:47 +0000
|
||||
Subject: define NBBY
|
||||
|
||||
|
||||
diff --git a/src/sys.h b/src/sys.h
|
||||
index 25b14bb..5425e3a 100644
|
||||
--- a/src/sys.h
|
||||
+++ b/src/sys.h
|
||||
@@ -139,4 +139,8 @@ extern char* tgoto(const char*, int, int);
|
||||
extern char* tgetstr(char*, char**);
|
||||
#endif
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+#define NBBY 8
|
||||
+#endif
|
||||
+
|
||||
#endif /* _h_sys */
|
||||
--
|
||||
1.8.3.4
|
||||
|
||||
Reference in New Issue
Block a user