Date: Mon, 14 Sep 2020 05:52:53 +0000 (UTC) From: Fukang Chen <loader@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r548588 - in branches/2020Q3/shells/zsh: . files Message-ID: <202009140552.08E5qrux066343@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: loader Date: Mon Sep 14 05:52:53 2020 New Revision: 548588 URL: https://svnweb.freebsd.org/changeset/ports/548588 Log: MFH: r548445 shells/zsh: Fix build with devel/ncurses 6.2 When devel/ncurses is installed in the system, the Zsh configure script detects and uses ${LOCALBASE}/include/ncurses/ncurses.h instead. The patch is obtained from this commit: https://sourceforge.net/p/zsh/code/ci/c6a85163619ed1cee89ab047a0d98108ed46828d/ cc -c -I. -I../../Src -I../../Src -I../../Src/Zle -I. -I/usr/local/include -DBOOL_DEFINED -DLIBICONV_PLUG -DHAVE_CONFIG_H -DMODULE -O2 -pipe -DLIBICONV_PLUG -fstack-protector-strong -fno-strict-aliasing -fPIC -o curses..o curses.c In file included from curses.c:210: ./curses_keys.h:93:15: error: use of undeclared identifier 'KEY_EVENT' {"EVENT", KEY_EVENT}, ^ 1 error generated. *** Error code 1 Reviewed by: koobs Approved by: koobs (ports, mentor) Differential Revision: https://reviews.freebsd.org/D26355 Approved by: ports-secteam (fluffy) Added: branches/2020Q3/shells/zsh/files/extra-patch-Src_Modules_curses__keys.awk - copied unchanged from r548445, head/shells/zsh/files/extra-patch-Src_Modules_curses__keys.awk Modified: branches/2020Q3/shells/zsh/Makefile Directory Properties: branches/2020Q3/ (props changed) Modified: branches/2020Q3/shells/zsh/Makefile ============================================================================== --- branches/2020Q3/shells/zsh/Makefile Mon Sep 14 05:47:50 2020 (r548587) +++ branches/2020Q3/shells/zsh/Makefile Mon Sep 14 05:52:53 2020 (r548588) @@ -88,6 +88,10 @@ SUB_FILES= pkg-message CONFIGURE_ENV+= ac_cv_lib_iconv_libiconv=no .endif +.if ${ncurses_ARGS} == port +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-Src_Modules_curses__keys.awk +.endif + post-patch: # FreeBSD's clock_gettime(2) is in libc, not librt; see PR 167857 @${REINPLACE_CMD} -e '/LIBS/s|-lrt||' ${WRKSRC}/configure Copied: branches/2020Q3/shells/zsh/files/extra-patch-Src_Modules_curses__keys.awk (from r548445, head/shells/zsh/files/extra-patch-Src_Modules_curses__keys.awk) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q3/shells/zsh/files/extra-patch-Src_Modules_curses__keys.awk Mon Sep 14 05:52:53 2020 (r548588, copy of r548445, head/shells/zsh/files/extra-patch-Src_Modules_curses__keys.awk) @@ -0,0 +1,18 @@ +https://sourceforge.net/p/zsh/code/ci/c6a85163619ed1cee89ab047a0d98108ed46828d/ +--- Src/Modules/curses_keys.awk.orig 2017-12-04 14:09:36 UTC ++++ Src/Modules/curses_keys.awk +@@ -12,8 +12,13 @@ BEGIN {nkeydefs = 0} + + END { + printf("static const struct zcurses_namenumberpair keypad_names[] = {\n") +- for (i = 0; i < 0 + nkeydefs; i++) ++ for (i = 0; i < 0 + nkeydefs; i++) { ++ if (name[i] == "EVENT") ++ printf("#ifdef KEY_EVENT\n") + printf(" {\"%s\", KEY_%s},\n", name[i], name[i]) ++ if (name[i] == "EVENT") ++ printf("#endif\n") ++ } + printf(" {NULL, 0}\n") + printf("};\n") + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009140552.08E5qrux066343>