rpms/swig
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Ignore locally installed ccache when running CCache unit tests (bz#1274031)

Browse Source
This commit is contained in:
Jitka Plesnikova 2015-10-22 12:05:20 +02:00
parent d90daf88d3
commit dade8d0afe
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
swig-ccache-conflict-fix.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git a/CCache/test.sh b/CCache/test.sh
index 6e5d267..a0e888d 100755
--- a/CCache/test.sh
+++ b/CCache/test.sh
@@ -15,6 +15,10 @@ else
SWIG=swig
fi
+# RH fix: Remove ccache from $PATH if it exists
+# as it will influence the unit tests
+PATH="`echo $PATH |awk -v RS=: -v ORS=: '/\/usr\/lib(64|)\/ccache(:|)/ {next} {print}' | sed 's/:*$//'`"
+
CCACHE=../ccache-swig
TESTDIR=test.$$

8
swig.spec
View File

@ -33,7 +33,7 @@
Summary: Connects C/C++/Objective C to some high-level programming languages Summary: Connects C/C++/Objective C to some high-level programming languages
Name: swig Name: swig
Version: 3.0.7 Version: 3.0.7
Release: 7%{?dist} Release: 8%{?dist}
License: GPLv3+ and BSD License: GPLv3+ and BSD
URL: http://swig.sourceforge.net/ URL: http://swig.sourceforge.net/
Source0: http://downloads.sourceforge.net/project/swig/swig/swig-%{version}/swig-%{version}.tar.gz Source0: http://downloads.sourceforge.net/project/swig/swig/swig-%{version}/swig-%{version}.tar.gz
@ -44,6 +44,7 @@ Source1: description.h2m
Patch1: swig307-Fix-Ruby-trackings-code-to-use-C-hash.patch Patch1: swig307-Fix-Ruby-trackings-code-to-use-C-hash.patch
Patch2: swig307-Ruby-trackings-patch-tidy-up.patch Patch2: swig307-Ruby-trackings-patch-tidy-up.patch
Patch3: swig307-Ruby-trackings-support-for-1.8.patch Patch3: swig307-Ruby-trackings-support-for-1.8.patch
Patch4: swig-ccache-conflict-fix.patch
BuildRequires: perl, python2-devel, pcre-devel BuildRequires: perl, python2-devel, pcre-devel
BuildRequires: autoconf, automake, gawk, dos2unix BuildRequires: autoconf, automake, gawk, dos2unix
@ -110,6 +111,7 @@ This package contains documentation for SWIG and useful examples
%patch1 -p1 -b .rubyhash %patch1 -p1 -b .rubyhash
%patch2 -p1 -b .rubytidyup %patch2 -p1 -b .rubytidyup
%patch3 -p1 -b .ruby18 %patch3 -p1 -b .ruby18
%patch4 -p1 -b .ccache-conflict
for all in CHANGES README; do for all in CHANGES README; do
iconv -f ISO88591 -t UTF8 < $all > $all.new iconv -f ISO88591 -t UTF8 < $all > $all.new
@ -209,6 +211,10 @@ ln -fs ../../bin/ccache-swig %{buildroot}%{_libdir}/ccache/swig
%doc Doc Examples COPYRIGHT %doc Doc Examples COPYRIGHT
%changelog %changelog
* Wed Oct 21 2015 David Sommerseth <davids@redhat.com> - 3.0.7-8
- Ignore locally installed ccache when running CCache unit tests
- Resolves: bz#1274031
* Wed Sep 16 2015 Jitka Plesnikova <jplesnik@redhat.com> - 3.0.7-7 * Wed Sep 16 2015 Jitka Plesnikova <jplesnik@redhat.com> - 3.0.7-7
- Remove the old setools patch. The bug was already fixed by upstream - Remove the old setools patch. The bug was already fixed by upstream
- Resolves: bz#1180257 - Resolves: bz#1180257