|
 |
17014ee |
From 5f7f73a57b16ef58769004fe2f4111baf1c81690 Mon Sep 17 00:00:00 2001
|
|
|
17014ee |
From: Jan Chaloupka <jchaloup@redhat.com>
|
|
|
17014ee |
Date: Mon, 21 Jul 2014 13:50:01 +0200
|
|
|
17014ee |
Subject: [PATCH] shlib
|
|
|
17014ee |
|
|
|
17014ee |
---
|
|
|
17014ee |
shlib/Makefile.in | 2 +-
|
|
|
17014ee |
support/shlib-install | 2 +-
|
|
|
17014ee |
support/shobj-conf | 5 +++--
|
|
|
17014ee |
3 files changed, 5 insertions(+), 4 deletions(-)
|
|
|
17014ee |
|
|
|
17014ee |
diff --git a/shlib/Makefile.in b/shlib/Makefile.in
|
|
|
17014ee |
index eb16211..3a34840 100644
|
|
|
17014ee |
--- a/shlib/Makefile.in
|
|
|
17014ee |
+++ b/shlib/Makefile.in
|
|
|
17014ee |
@@ -178,7 +178,7 @@ $(SHARED_READLINE): $(SHARED_OBJ)
|
|
|
17014ee |
|
|
|
17014ee |
$(SHARED_HISTORY): $(SHARED_HISTOBJ) xmalloc.so xfree.so
|
|
|
17014ee |
$(RM) $@
|
|
|
17014ee |
- $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so xfree.so $(SHLIB_LIBS)
|
|
|
17014ee |
+ $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so xfree.so
|
|
|
17014ee |
|
|
|
17014ee |
# Since tilde.c is shared between readline and bash, make sure we compile
|
|
|
17014ee |
# it with the right flags when it's built as part of readline
|
|
|
17014ee |
diff --git a/support/shlib-install b/support/shlib-install
|
|
|
17014ee |
index cfec3bd..f4eea27 100755
|
|
|
17014ee |
--- a/support/shlib-install
|
|
|
17014ee |
+++ b/support/shlib-install
|
|
|
17014ee |
@@ -73,7 +73,7 @@ fi
|
|
|
17014ee |
case "$host_os" in
|
|
|
17014ee |
hpux*|darwin*|macosx*|linux*|solaris2*)
|
|
|
17014ee |
if [ -z "$uninstall" ]; then
|
|
|
17014ee |
- chmod 555 ${INSTALLDIR}/${LIBNAME}
|
|
|
17014ee |
+ chmod 755 ${INSTALLDIR}/${LIBNAME}
|
|
|
17014ee |
fi ;;
|
|
|
17014ee |
cygwin*|mingw*)
|
|
|
17014ee |
IMPLIBNAME=`echo ${LIBNAME} \
|
|
|
17014ee |
diff --git a/support/shobj-conf b/support/shobj-conf
|
|
|
17014ee |
index 1f64433..40827a4 100644
|
|
|
17014ee |
--- a/support/shobj-conf
|
|
|
17014ee |
+++ b/support/shobj-conf
|
|
|
17014ee |
@@ -126,10 +126,11 @@ sunos5*|solaris2*)
|
|
|
17014ee |
linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo)
|
|
|
17014ee |
SHOBJ_CFLAGS=-fPIC
|
|
|
17014ee |
SHOBJ_LD='${CC}'
|
|
|
17014ee |
- SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
|
|
|
17014ee |
+ SHOBJ_LDFLAGS='$(CFLAGS) -shared -Wl,-soname,$@'
|
|
|
17014ee |
|
|
|
17014ee |
- SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
|
|
|
17014ee |
+ SHLIB_XLDFLAGS='-Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
|
|
|
17014ee |
SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
|
|
|
17014ee |
+ SHLIB_LIBS='-ltinfo'
|
|
|
17014ee |
;;
|
|
|
17014ee |
|
|
|
17014ee |
freebsd2*)
|
|
|
17014ee |
--
|
|
|
17014ee |
1.9.3
|
|
|
17014ee |
|