diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2019-07-30 21:33:26 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2019-07-30 21:33:26 +0100 |
| commit | 1c214b3e3dcf6b9f5eff36eb4f161358ae366a51 (patch) | |
| tree | 50d56a23b8a19d005474e83fd1e12d371e76fba4 | |
| parent | lcov patches to support gcc-9 (diff) | |
| download | patches-1c214b3e3dcf6b9f5eff36eb4f161358ae366a51.tar.bz2 patches-1c214b3e3dcf6b9f5eff36eb4f161358ae366a51.tar.xz patches-1c214b3e3dcf6b9f5eff36eb4f161358ae366a51.zip | |
Patch for hstr segfault and rebuild
| -rw-r--r-- | app-shells/hstr/pkg-config.patch | 81 |
1 files changed, 81 insertions, 0 deletions
diff --git a/app-shells/hstr/pkg-config.patch b/app-shells/hstr/pkg-config.patch new file mode 100644 index 0000000..215fd5c --- /dev/null +++ b/app-shells/hstr/pkg-config.patch @@ -0,0 +1,81 @@ +diff --git a/configure.ac b/configure.ac +index 1676ec8..73c8be5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -47,39 +47,33 @@ then + fi + + # PKG_CHECK_MODULES macro is NOT used to avoid confusing syntax errors in case that pkg-config is NOT installed +-AC_CHECK_LIB(ncursesw, killwchar, [], +-[ +- AC_CHECK_LIB(ncurses, killwchar, [], +- [ +- AC_SUBST([NCURSESW_CFLAGS]) +- AC_SUBST([NCURSESW_LIBS]) +- if pkg-config --exists ncursesw +- then +- AC_MSG_NOTICE([Module ncursesw found]) +- NCURSESW_CFLAGS=`pkg-config --cflags ncursesw` +- NCURSESW_LIBS=`pkg-config --libs ncursesw` +- else +- if pkg-config --exists ncurses +- then +- AC_MSG_NOTICE([Module ncurses found]) +- NCURSESW_CFLAGS=`pkg-config --cflags ncursesw` +- NCURSESW_LIBS=`pkg-config --libs ncurses` +- else +- AS_CASE([$host_os], +- [darwin*], +- [ +- AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])]) +- AC_CHECK_HEADER(curses.h) +- ], +- [ +- AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])]) +- AC_CHECK_HEADER(ncursesw/curses.h) +- ] +- ) +- fi +- fi +- ]) # FAIL of ncurses +-]) # FAIL of ncursesw ++AC_SUBST([NCURSESW_CFLAGS]) ++AC_SUBST([NCURSESW_LIBS]) ++if pkg-config --exists ncursesw ++then ++ AC_MSG_NOTICE([Module ncursesw found]) ++ NCURSESW_CFLAGS=`pkg-config --cflags ncursesw` ++ NCURSESW_LIBS=`pkg-config --libs ncursesw` ++else ++ if pkg-config --exists ncurses ++ then ++ AC_MSG_NOTICE([Module ncurses found]) ++ NCURSESW_CFLAGS=`pkg-config --cflags ncursesw` ++ NCURSESW_LIBS=`pkg-config --libs ncurses` ++ else ++ AS_CASE([$host_os], ++ [darwin*], ++ [ ++ AC_CHECK_LIB(ncurses, killwchar, [], [AC_MSG_ERROR([Could not find ncurses library])]) ++ AC_CHECK_HEADER(curses.h) ++ ], ++ [ ++ AC_CHECK_LIB(ncursesw, killwchar, [], [AC_MSG_ERROR([Could not find ncursesw library])]) ++ AC_CHECK_HEADER(ncursesw/curses.h) ++ ] ++ ) ++ fi ++fi + + + # Checks for libraries. +diff --git a/src/Makefile.am b/src/Makefile.am +index 7640d21..17a82b7 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -37,4 +37,4 @@ hstr_SOURCES = \ + install-exec-hook: + ln $(DESTDIR)$(bindir)/hstr$(EXEEXT) $(DESTDIR)$(bindir)/hh$(EXEEXT) + +-hstr_LDADD = $(NCURSES_LIBS) ++hstr_LDADD = $(NCURSESW_LIBS) |