Fixed tcltests path

Resolves: rhbz#1833701
This commit is contained in:
Jaroslav Škarvada 2020-05-13 19:29:21 +02:00
parent 4c0debb8cf
commit d3453c4613
2 changed files with 20 additions and 1 deletions

View File

@ -0,0 +1,13 @@
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 99bdf05..0b2f660 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -788,7 +788,7 @@ topDirName:
# This keeps tcltest from picking up an already installed version of the Tcl
# library.
SHELL_ENV = @LD_LIBRARY_PATH_VAR@=`pwd`:${@LD_LIBRARY_PATH_VAR@} \
- TCLLIBPATH="@abs_builddir@/pkgs" \
+ TCLLIBPATH="@abs_builddir@/pkgs @abs_builddir@/../tests" \
TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"
${TCLTEST_EXE}: ${TCLTEST_OBJS} ${TCL_LIB_FILE} ${TCL_STUB_LIB_FILE} ${BUILD_DLTEST}

View File

@ -5,7 +5,7 @@
Summary: Tool Command Language, pronounced tickle
Name: tcl
Version: %{vers}
Release: 1%{?dist}
Release: 2%{?dist}
Epoch: 1
License: TCL
URL: http://tcl.sourceforge.net/
@ -19,6 +19,7 @@ Provides: tcl-tcldict = %{vers}
Patch0: tcl-8.6.10-autopath.patch
Patch1: tcl-8.6.10-conf.patch
Patch2: tcl-8.6.10-hidden.patch
Patch3: tcl-8.6.10-tcltests-path-fix.patch
%if %sdt
BuildRequires: systemtap-sdt-devel
@ -64,6 +65,7 @@ chmod -x generic/tclStrToD.c
%patch0 -p1 -b .autopath
%patch1 -p1 -b .conf
%patch2 -p1 -b .hidden
%patch3 -p1 -b .tcltests-path-fix
%build
pushd unix
@ -141,6 +143,10 @@ rm -rf %{buildroot}/%{_datadir}/%{name}%{majorver}/ldAix
%{_datadir}/%{name}%{majorver}/tclAppInit.c
%changelog
* Wed May 13 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 1:8.6.10-2
- Fixed tcltests path
Resolves: rhbz#1833701
* Tue Nov 26 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 1:8.6.10-1
- New version
- Updated patches