1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
--- origsrc/ncurses-5.7/c++/Makefile.in 2010-01-02 09:09:29.061000000 -0500
+++ src/ncurses-5.7/c++/Makefile.in 2010-01-02 09:10:21.752000000 -0500
@@ -161,7 +161,7 @@ LIB_OBJS = \
cd ../lib && $(LIBTOOL_LINK) $(CXX) $(CXXFLAGS) \
-o $(LIBNAME) $(LIB_OBJS:$o=.lo) \
-rpath $(INSTALL_PREFIX)$(libdir) \
- -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(SHLIB_LIST)
+ -version-info $(ABI_VERSION):0:0 $(LT_UNDEF) $(SHLIB_LIST)
OBJS_DEMO = $(MODEL)/demo$o
--- origsrc/ncurses-5.7/configure.in 2010-01-02 09:09:41.557000000 -0500
+++ src/ncurses-5.7/configure.in 2010-01-02 09:10:21.763000000 -0500
@@ -1113,7 +1113,17 @@ if test "$with_reentrant" = yes ; then
if test $cf_cv_weak_symbols = yes ; then
CF_REMOVE_LIB(LIBS,$LIBS,pthread)
else
- LIB_SUFFIX="t${LIB_SUFFIX}"
+ # when not using weak symbols but with_reentrant,
+ # add 't' to the library suffix on all platforms
+ # except cygwin, where we only do that if ALSO
+ # compiling with full thread support.
+ case "$host" in
+ *cygwin* )
+ if test "$with_pthread" = "yes" ; then
+ LIB_SUFFIX="t${LIB_SUFFIX}"
+ fi ;;
+ * ) LIB_SUFFIX="t${LIB_SUFFIX}" ;;
+ esac
fi
AC_DEFINE(USE_REENTRANT)
CF_NCURSES_ABI_6
--- origsrc/ncurses-5.7/mk-1st.awk 2010-01-02 09:09:41.572000000 -0500
+++ src/ncurses-5.7/mk-1st.awk 2010-01-02 09:10:21.774000000 -0500
@@ -387,11 +387,11 @@ END {
end_name = lib_name;
printf "../lib/%s : $(%s_OBJS)\n", lib_name, OBJS
if ( is_ticlib() ) {
- printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(TICS_LIST)\n", compile, lib_name, OBJS
+ printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) -version-info $(ABI_VERSION):0:0 $(LT_UNDEF) $(TICS_LIST)\n", compile, lib_name, OBJS
} else if ( is_termlib() ) {
- printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(TINFO_LIST)\n", compile, lib_name, OBJS
+ printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) -version-info $(ABI_VERSION):0:0 $(LT_UNDEF) $(TINFO_LIST)\n", compile, lib_name, OBJS
} else {
- printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(SHLIB_LIST)\n", compile, lib_name, OBJS
+ printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) -version-info $(ABI_VERSION):0:0 $(LT_UNDEF) $(SHLIB_LIST)\n", compile, lib_name, OBJS
}
print ""
print "install \\"
|
