cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for clang-6. This patch is already upstream:

Browse Source 
https://github.com/fish-shell/fish-shell/pull/4685

ship it! jca@
This commit is contained in:
abieber 2018-04-08 22:49:23 +00:00
parent 68550ad466
commit a6869f77dc
3 changed files with 52 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
shells/fish/Makefile
View File

@ -1,14 +1,17 @@
# $OpenBSD: Makefile,v 1.3 2018/03/05 13:50:39 abieber Exp $
# $OpenBSD: Makefile,v 1.4 2018/04/08 22:49:23 abieber Exp $
COMMENT = friendly interactive shell
V = 2.7.1
DISTNAME = fish-$V
REVISION = 0
CATEGORIES = shells
HOMEPAGE = https://fishshell.com/
MAINTAINER = Aaron Bieber <abieber@openbsd.org>
# GPLv2 only
PERMIT_PACKAGE_CDROM = Yes
@ -21,7 +24,13 @@ COMPILER = base-clang ports-gcc ports-clang
MODULES = lang/python
BUILD_DEPENDS = devel/gettext-tools
# https://github.com/fish-shell/fish-shell/pull/4685
AUTOCONF_VERSION = 2.69
AUTOMAKE_VERSION = 1.15
BUILD_DEPENDS = devel/gettext-tools \
${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS}
LIB_DEPENDS = devel/pcre2 \
devel/gettext
@ -47,6 +56,8 @@ NO_TEST = yes
pre-configure:
sed -i 's/getopt/gnugetopt/' ${WRKSRC}/share/functions/*.fish
cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} autoreconf
post-install:
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \

23
shells/fish/patches/patch-configure_ac Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-configure_ac,v 1.1 2018/04/08 22:49:23 abieber Exp $
https://github.com/fish-shell/fish-shell/pull/4685
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -402,6 +402,15 @@ AC_TRY_LINK( [ #include <wchar.h> ],
[AC_MSG_RESULT(no)],
)
+AC_MSG_CHECKING([for std::make_unique])
+AC_TRY_LINK( [ #include <memory> ],
+ [ std::unique_ptr<int> foo = std::make_unique<int>(); ],
+ [ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_STD__MAKE_UNIQUE, 1, Define to 1 if you have the `std::make_unique' function.)
+ ],
+ [AC_MSG_RESULT(no)],
+ )
+
if test x$local_gettext != xno; then
AC_CHECK_FUNCS( gettext )

16
shells/fish/patches/patch-src_common_h Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_common_h,v 1.1 2018/04/08 22:49:23 abieber Exp $
https://github.com/fish-shell/fish-shell/pull/4685
Index: src/common.h
--- src/common.h.orig
+++ src/common.h
@@ -658,7 +658,7 @@ wcstring vformat_string(const wchar_t *format, va_list
void append_format(wcstring &str, const wchar_t *format, ...);
void append_formatv(wcstring &str, const wchar_t *format, va_list ap);
-#ifdef __cpp_lib_make_unique
+#ifdef HAVE_STD__MAKE_UNIQUE
using std::make_unique;
#else
/// make_unique implementation