parent
1215ce4402
commit
449e305e41
2 changed files with 11 additions and 46 deletions
|
@ -4,49 +4,9 @@ Date: Thu, 5 Nov 2020 02:49:21 +0100
|
||||||
Subject: [PATCH] drop rpath and link against the termcap library
|
Subject: [PATCH] drop rpath and link against the termcap library
|
||||||
|
|
||||||
---
|
---
|
||||||
configure | 8 ++++----
|
|
||||||
configure.ac | 8 ++++----
|
|
||||||
support/shobj-conf | 2 +-
|
support/shobj-conf | 2 +-
|
||||||
3 files changed, 9 insertions(+), 9 deletions(-)
|
1 file changed, 1 insertions(+), 1 deletions(-)
|
||||||
|
|
||||||
diff --git configure configure
|
|
||||||
index 7d7bce0..eff4e76 100755
|
|
||||||
--- a/configure
|
|
||||||
+++ b/configure
|
|
||||||
@@ -6823,10 +6823,10 @@ if test -f ${srcdir}/support/shobj-conf; then
|
|
||||||
$as_echo_n "checking configuration for building shared libraries... " >&6; }
|
|
||||||
eval `TERMCAP_LIB=$TERMCAP_LIB ${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}`
|
|
||||||
|
|
||||||
-# case "$SHLIB_LIBS" in
|
|
||||||
-# *curses*|*termcap*|*termlib*) ;;
|
|
||||||
-# *) SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
|
|
||||||
-# esac
|
|
||||||
+ case "$SHLIB_LIBS" in
|
|
||||||
+ *curses*|*termcap*|*termlib*) ;;
|
|
||||||
+ *) SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
|
|
||||||
+ esac
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
diff --git configure.ac configure.ac
|
|
||||||
index db788a6..9ac3eef 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -227,10 +227,10 @@ if test -f ${srcdir}/support/shobj-conf; then
|
|
||||||
AC_MSG_CHECKING(configuration for building shared libraries)
|
|
||||||
eval `TERMCAP_LIB=$TERMCAP_LIB ${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}`
|
|
||||||
|
|
||||||
-# case "$SHLIB_LIBS" in
|
|
||||||
-# *curses*|*termcap*|*termlib*) ;;
|
|
||||||
-# *) SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
|
|
||||||
-# esac
|
|
||||||
+ case "$SHLIB_LIBS" in
|
|
||||||
+ *curses*|*termcap*|*termlib*) ;;
|
|
||||||
+ *) SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
|
|
||||||
+ esac
|
|
||||||
|
|
||||||
AC_SUBST(SHOBJ_CC)
|
|
||||||
AC_SUBST(SHOBJ_CFLAGS)
|
|
||||||
diff --git support/shobj-conf support/shobj-conf
|
diff --git support/shobj-conf support/shobj-conf
|
||||||
index 7920f1b..7ac9c9f 100644
|
index 7920f1b..7ac9c9f 100644
|
||||||
--- a/support/shobj-conf
|
--- a/support/shobj-conf
|
||||||
|
|
|
@ -1,19 +1,24 @@
|
||||||
# Template file for 'libreadline8'
|
# Template file for 'libreadline8'
|
||||||
pkgname=libreadline8
|
pkgname=libreadline8
|
||||||
version=8.1.000
|
version=8.2.001
|
||||||
revision=1
|
revision=1
|
||||||
_dist_ver="${version%.*}"
|
_dist_ver="${version%.*}"
|
||||||
_patch_ver="${version##*.}"
|
_patch_ver="${version##*.}"
|
||||||
bootstrap=yes
|
bootstrap=yes
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--with-curses --enable-multibyte bash_cv_termcap_lib=libncursesw"
|
configure_args="--with-curses --with-shared-termcap-library --enable-multibyte
|
||||||
|
bash_cv_termcap_lib=libncursesw"
|
||||||
makedepends="ncurses-devel"
|
makedepends="ncurses-devel"
|
||||||
short_desc="GNU Readline Library"
|
short_desc="GNU Readline Library"
|
||||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
maintainer="Orphaned <orphan@voidlinux.org>"
|
||||||
license="GPL-3.0-or-later"
|
license="GPL-3.0-or-later"
|
||||||
homepage="https://tiswww.cwru.edu/php/chet/readline/rltop.html"
|
homepage="https://tiswww.cwru.edu/php/chet/readline/rltop.html"
|
||||||
distfiles="${GNU_SITE}/readline/readline-${_dist_ver}.tar.gz"
|
changelog="https://tiswww.cwru.edu/php/chet/readline/NEWS"
|
||||||
checksum=f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02
|
distfiles="${GNU_SITE}/readline/readline-${_dist_ver}.tar.gz
|
||||||
|
${GNU_SITE}/readline/readline-${_dist_ver}-patches/readline${_dist_ver/./}-001"
|
||||||
|
checksum="3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35
|
||||||
|
bbf97f1ec40a929edab5aa81998c1e2ef435436c597754916e6a5868f273aff7"
|
||||||
|
skip_extraction="readline${_dist_ver/./}-001"
|
||||||
|
|
||||||
post_patch() {
|
post_patch() {
|
||||||
cd ${wrksrc}
|
cd ${wrksrc}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue