]>
Commit | Line | Data |
---|---|---|
07490c27 SS |
1 | diff -up readline-6.2/shlib/Makefile.in.shlib readline-6.2/shlib/Makefile.in |
2 | --- readline-6.2/shlib/Makefile.in.shlib 2010-12-28 21:56:21.000000000 +0100 | |
3 | +++ readline-6.2/shlib/Makefile.in 2011-02-14 17:34:38.821537496 +0100 | |
e260e242 SS |
4 | @@ -170,7 +170,7 @@ $(SHARED_READLINE): $(SHARED_OBJ) |
5 | ||
07490c27 | 6 | $(SHARED_HISTORY): $(SHARED_HISTOBJ) xmalloc.so xfree.so |
e260e242 | 7 | $(RM) $@ |
07490c27 SS |
8 | - $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so xfree.so $(SHLIB_LIBS) |
9 | + $(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so xfree.so | |
e260e242 SS |
10 | |
11 | # Since tilde.c is shared between readline and bash, make sure we compile | |
12 | # it with the right flags when it's built as part of readline | |
07490c27 SS |
13 | diff -up readline-6.2/support/shlib-install.shlib readline-6.2/support/shlib-install |
14 | --- readline-6.2/support/shlib-install.shlib 2009-10-28 14:30:18.000000000 +0100 | |
15 | +++ readline-6.2/support/shlib-install 2011-02-14 17:33:07.611768164 +0100 | |
e260e242 | 16 | @@ -72,7 +72,7 @@ fi |
3869516a MT |
17 | case "$host_os" in |
18 | hpux*|darwin*|macosx*|linux*) | |
19 | if [ -z "$uninstall" ]; then | |
20 | - chmod 555 ${INSTALLDIR}/${LIBNAME} | |
21 | + chmod 755 ${INSTALLDIR}/${LIBNAME} | |
22 | fi ;; | |
e260e242 | 23 | cygwin*|mingw*) |
3869516a | 24 | IMPLIBNAME=`echo ${LIBNAME} \ |
07490c27 SS |
25 | diff -up readline-6.2/support/shobj-conf.shlib readline-6.2/support/shobj-conf |
26 | --- readline-6.2/support/shobj-conf.shlib 2009-10-28 14:20:21.000000000 +0100 | |
27 | +++ readline-6.2/support/shobj-conf 2011-02-14 17:33:07.612767986 +0100 | |
e260e242 SS |
28 | @@ -112,10 +112,11 @@ sunos5*|solaris2*) |
29 | linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo) | |
3869516a MT |
30 | SHOBJ_CFLAGS=-fPIC |
31 | SHOBJ_LD='${CC}' | |
32 | - SHOBJ_LDFLAGS='-shared -Wl,-soname,$@' | |
e260e242 | 33 | + SHOBJ_LDFLAGS='$(CFLAGS) -shared -Wl,-soname,$@' |
3869516a MT |
34 | |
35 | - SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`' | |
36 | + SHLIB_XLDFLAGS='-Wl,-soname,`basename $@ $(SHLIB_MINOR)`' | |
37 | SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)' | |
e260e242 | 38 | + SHLIB_LIBS='-ltinfo' |
3869516a MT |
39 | ;; |
40 | ||
e260e242 | 41 | freebsd2*) |