Accepting request 688672 from devel:tools:building
- Sort out the bcond_with/without for the multibuild to work
properly
- Fix the testsuite pass to keep working
- Use regular python macros
- Use fdupes
- scons 3.0.4:
* Add TEMPFILESUFFIX to allow a customizable filename extension
* Update TempFileMunge class to use PRINT_CMD_LINE_FUNC
* Enhance cpp scanner regex logic to detect if/elif expressions
without whitespaces but parenthesis like "#if(defined FOO)" or
"#elif!(BAR)" correctly.
OBS-URL: https://build.opensuse.org/request/show/688672
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/scons?expand=0&rev=40
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
2fe57647d4
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5d96f6c411849420d4053643a2837c8411b331be60670e4590ad0e4c0a536e02
|
||||
size 5497106
|
||||
3
3.0.4.tar.gz
Normal file
3
3.0.4.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:09dd9ba8f78cf1622ce89a5b55e0fc9d33fe0d29e90eb90eaf652047090ac403
|
||||
size 5500498
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:257dd3c237dd4c1aba875d30073f32a7957710d0f1f021eadde7bba46f96d6ef
|
||||
size 209683
|
||||
3
scons-user.html-3.0.4.tar.bz2
Normal file
3
scons-user.html-3.0.4.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:be146957bd4767fbee0b0c80a5679e29340c7ac78589827024e0e66e0772caaf
|
||||
size 155930
|
||||
@ -1,3 +1,26 @@
|
||||
-------------------------------------------------------------------
|
||||
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>
|
||||
|
||||
- Fix the testsuite pass to keep working
|
||||
- Use regular python macros
|
||||
- Use fdupes
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 1 19:44:24 UTC 2019 - Andreas Stieger <andreas.stieger@gmx.de>
|
||||
|
||||
- scons 3.0.4:
|
||||
* Add TEMPFILESUFFIX to allow a customizable filename extension
|
||||
* Update TempFileMunge class to use PRINT_CMD_LINE_FUNC
|
||||
* Enhance cpp scanner regex logic to detect if/elif expressions
|
||||
without whitespaces but parenthesis like "#if(defined FOO)" or
|
||||
"#elif!(BAR)" correctly.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 15 15:10:42 UTC 2019 - astieger@suse.com
|
||||
|
||||
|
||||
46
scons.spec
46
scons.spec
@ -17,24 +17,16 @@
|
||||
|
||||
|
||||
%define modname scons
|
||||
|
||||
%global flavor @BUILD_FLAVOR@%{nil}
|
||||
%bcond_with test
|
||||
|
||||
# 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"
|
||||
%define psuffix -test
|
||||
%bcond_without test
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if %{with test}
|
||||
Name: %{modname}-%{flavor}
|
||||
%else
|
||||
Name: %{modname}
|
||||
%define psuffix %{nil}
|
||||
%bcond_with test
|
||||
%endif
|
||||
Version: 3.0.3
|
||||
Name: scons%{psuffix}
|
||||
Version: 3.0.4
|
||||
Release: 0
|
||||
Summary: Replacement for Make
|
||||
License: MIT
|
||||
@ -47,30 +39,31 @@ Source1: scons-user.html-%{version}.tar.bz2
|
||||
Source2: grep-filter-list.txt
|
||||
# Local modification
|
||||
Patch8: scons-3.0.0-fix-install.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: grep
|
||||
BuildRequires: python3-base >= 3.5
|
||||
BuildRequires: python3-lxml
|
||||
BuildRequires: python3-setuptools
|
||||
Requires: python3-base >= 3.5
|
||||
%if %{with test}
|
||||
# texlive texlive-latex3 biber texmaker ghostscript
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: bison
|
||||
# For tests
|
||||
BuildRequires: clang
|
||||
BuildRequires: docbook-xsl-pdf2index
|
||||
BuildRequires: docbook5-xsl-stylesheets
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: git
|
||||
BuildRequires: libtool
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: libxslt-devel
|
||||
BuildRequires: libxslt-tools
|
||||
BuildRequires: xmlgraphics-fop
|
||||
# texlive texlive-latex3 biber texmaker ghostscript
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: bison
|
||||
BuildRequires: git
|
||||
BuildRequires: libtool
|
||||
BuildRequires: pcre-devel
|
||||
BuildRequires: subversion
|
||||
BuildRequires: swig
|
||||
BuildRequires: xmlgraphics-fop
|
||||
%endif
|
||||
|
||||
%description
|
||||
@ -89,31 +82,40 @@ sed -i -e '/QT_LIBPATH = os.path.join.*QTDIR/s/lib/%{_lib}/' \
|
||||
sed -i 's|%{_bindir}/env python|%{_bindir}/python3|' src/script/*
|
||||
|
||||
cp %{SOURCE2} grep-filter-list.txt
|
||||
chmod -x src/CHANGES.txt README.rst src/RELEASE.txt
|
||||
|
||||
# the test is marked skipped but fails
|
||||
rm test/MSVS/vs-14.1-exec.py
|
||||
|
||||
%build
|
||||
python3 bootstrap.py build/scons
|
||||
cd build/scons
|
||||
%py3_build
|
||||
%python3_build
|
||||
|
||||
%install
|
||||
%if !%{with test}
|
||||
cd build/scons
|
||||
ls -lh build/lib
|
||||
%py3_install \
|
||||
%python3_install \
|
||||
--standard-lib \
|
||||
--no-install-bat \
|
||||
--no-version-script \
|
||||
--install-scripts=%{_bindir} \
|
||||
--record installed_files.txt
|
||||
%fdupes %{buildroot}%{python3_sitelib}
|
||||
%endif
|
||||
|
||||
%check
|
||||
%if %{with test}
|
||||
%ifnarch aarch64 armv7l ppc64 ppc64le s390x
|
||||
TEMP_FILE=$(mktemp --tmpdir %{modname}-test.XXXXXX)
|
||||
trap 'rm -f -- "$TEMP_FILE"' INT TERM HUP EXIT
|
||||
find src/ test/ -name \*.py \
|
||||
| grep -F -v -f grep-filter-list.txt >$TEMP_FILE
|
||||
python3 runtest.py -f $TEMP_FILE
|
||||
%else
|
||||
echo "Skiping tests on this architecture due to failures"
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%files
|
||||
|
||||
Loading…
Reference in New Issue
Block a user