pool/scons
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Sort out the bcond_with/without for the multibuild to work

Browse Source 
properly

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/scons?expand=0&rev=79
This commit is contained in:
Tomáš Chvátal 2019-03-26 11:24:36 +00:00 committed by Git OBS Bridge
parent 1242be14fe
commit f70eed099a
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scons.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Mar 26 11:24:14 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
- Sort out the bcond_with/without for the multibuild to work
properly
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 25 09:32:57 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com> Mon Mar 25 09:32:57 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>

11
scons.spec
View File

@ -18,16 +18,13 @@
%define modname scons %define modname scons
%global flavor @BUILD_FLAVOR@%{nil} %global flavor @BUILD_FLAVOR@%{nil}
# Tests on non-Intel archs have too many failing tests
# https://pairlist4.pair.net/pipermail/scons-users/2018-October/007311.html
%ifnarch aarch64 armv7l ppc64 ppc64le s390x
%if "%{flavor}" == "test" %if "%{flavor}" == "test"
%define psuffix -test %define psuffix -test
%bcond_without test %bcond_without test
%endif %else
%endif
%define psuffix %{nil} %define psuffix %{nil}
%bcond_with test %bcond_with test
%endif
Name: scons%{psuffix} Name: scons%{psuffix}
Version: 3.0.4 Version: 3.0.4
Release: 0 Release: 0
@ -110,11 +107,15 @@ ls -lh build/lib
%check %check
%if %{with test} %if %{with test}
%ifnarch aarch64 armv7l ppc64 ppc64le s390x
TEMP_FILE=$(mktemp --tmpdir %{modname}-test.XXXXXX) TEMP_FILE=$(mktemp --tmpdir %{modname}-test.XXXXXX)
trap 'rm -f -- "$TEMP_FILE"' INT TERM HUP EXIT trap 'rm -f -- "$TEMP_FILE"' INT TERM HUP EXIT
find src/ test/ -name \*.py \ find src/ test/ -name \*.py \
| grep -F -v -f grep-filter-list.txt >$TEMP_FILE | grep -F -v -f grep-filter-list.txt >$TEMP_FILE
python3 runtest.py -f $TEMP_FILE python3 runtest.py -f $TEMP_FILE
%else
echo "Skiping tests on this architecture due to failures"
%endif
%endif %endif
%files %files