Change patch, now with soname.

This commit is contained in:
Marcela Mašláňová 2007-08-09 08:07:35 +00:00
parent 109ac567e2
commit ac23040423
2 changed files with 22 additions and 5 deletions

View File

@ -1,5 +1,5 @@
--- tcl8.4.15/unix/configure.in.confi 2007-05-24 22:40:13.000000000 +0200
+++ tcl8.4.15/unix/configure.in 2007-07-31 11:03:00.000000000 +0200
+++ tcl8.4.15/unix/configure.in 2007-08-08 12:50:16.000000000 +0200
@@ -246,7 +246,7 @@
}], tcl_cv_strstr_unbroken=ok, tcl_cv_strstr_unbroken=broken,
tcl_cv_strstr_unbroken=broken)])
@ -46,7 +46,7 @@
#--------------------------------------------------------------------
--- tcl8.4.15/unix/tcl.m4.confi 2007-05-24 22:40:13.000000000 +0200
+++ tcl8.4.15/unix/tcl.m4 2007-07-31 11:01:32.000000000 +0200
+++ tcl8.4.15/unix/tcl.m4 2007-08-09 07:51:59.000000000 +0200
@@ -1124,7 +1124,7 @@
# AIX v<=4.1 has some different flags than 4.2+
@ -56,12 +56,26 @@
DL_LIBS="-lld"
fi
@@ -1345,11 +1345,11 @@
#CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
if test "$have_dl" = yes; then
- SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
+ SHLIB_LD='${CC} ${CFLAGS} -shared ${LDFLAGS} -Wl,-soname,${@}'
DL_OBJS="tclLoadDl.o"
DL_LIBS="-ldl"
LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ CC_SEARCH_FLAGS=''
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
else
AC_CHECK_HEADER(dld.h, [
@@ -1381,7 +1381,7 @@
# is kind of overkill but it works.
# Disable inlining only when one of the
# files in compat/*.c is being linked in.
- if test x"${LIBOBJS}" != x ; then
+ if test x"${AC_LIBOBJ}" != x ; then
+ if test x"${LIB@&t@OBJS}" != x ; then
CFLAGS="$CFLAGS -fno-inline"
fi
@ -75,7 +89,7 @@
fi
fi
--- tcl8.4.15/unix/Makefile.in.confi 2007-05-24 22:40:13.000000000 +0200
+++ tcl8.4.15/unix/Makefile.in 2007-07-31 11:02:13.000000000 +0200
+++ tcl8.4.15/unix/Makefile.in 2007-08-08 12:50:16.000000000 +0200
@@ -628,7 +628,7 @@
fi
@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"

View File

@ -3,7 +3,7 @@
Summary: Tcl scripting language development environment
Name: tcl
Version: %{majorver}.15
Release: 2%{?dist}
Release: 3%{?dist}
Epoch: 1
License: BSD
Group: Development/Languages
@ -140,6 +140,9 @@ rm -rf $RPM_BUILD_ROOT
%doc %{name}%{version}/html/*
%changelog
* Thu Aug 9 2007 Marcela Maslanova <mmaslano@redhat.com> - 1:8.4.15-3
- Resolves: rhbz#251410
* Mon Aug 6 2007 Michael Thomas <wart@kobold.org> - 1:8.4.15-2
- Explicitly add %%{_datadir}/tcl8.4 and %%{_libdir}/tcl8.4 to the
auto_path.