65 lines
2.1 KiB
Diff
65 lines
2.1 KiB
Diff
From 78a3bfc099027df04d01012b91e707c99eaf1c8e Mon Sep 17 00:00:00 2001
|
|
From: Daniel Kolesa <daniel@octaforge.org>
|
|
Date: Thu, 5 Nov 2020 02:49:21 +0100
|
|
Subject: [PATCH] drop rpath and link against the termcap library
|
|
|
|
---
|
|
configure | 8 ++++----
|
|
configure.ac | 8 ++++----
|
|
support/shobj-conf | 2 +-
|
|
3 files changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
diff --git configure configure
|
|
index 7d7bce0..eff4e76 100755
|
|
--- configure
|
|
+++ 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
|
|
--- configure.ac
|
|
+++ 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
|
|
index 7920f1b..7ac9c9f 100644
|
|
--- support/shobj-conf
|
|
+++ support/shobj-conf
|
|
@@ -128,7 +128,7 @@ linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo)
|
|
SHOBJ_LD='${CC}'
|
|
SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
|
|
|
|
- SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
|
|
+ SHLIB_XLDFLAGS='-Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
|
|
SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
|
|
;;
|
|
|
|
--
|
|
2.29.2
|
|
|