forked from pool/cura-engine
Accepting request 523769 from home:StefanBruens:branches:science
- Fixed RPM Group - Fix build on TW, parallel installation of gcc6/7 causes build errors - Build CuraEngine as PIE OBS-URL: https://build.opensuse.org/request/show/523769 OBS-URL: https://build.opensuse.org/package/show/science/cura-engine?expand=0&rev=8
This commit is contained in:
parent
d33c894b56
commit
3a27d1d65e
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7575ade071d9f6bb28a297edbf3933f927232683ffe4076e634e579cc1e8a6ff
|
||||
oid sha256:7a92096401c88e406cb47e2b7649838ae0a5888937cb37185dd2a7d701676db5
|
||||
size 2661388
|
||||
|
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 12 17:03:00 UTC 2017 - stefan.bruens@rwth-aachen.de
|
||||
|
||||
- Fixed RPM Group
|
||||
- Fix build on TW, parallel installation of gcc6/7 causes build errors
|
||||
- Build CuraEngine as PIE
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 4 05:48:30 UTC 2017 - adrian@suse.de
|
||||
|
||||
|
@ -17,17 +17,21 @@
|
||||
|
||||
|
||||
Name: cura-engine
|
||||
Version: 15.04.3
|
||||
Version: 2.7.0
|
||||
Release: 0
|
||||
Summary: 3D printer control software
|
||||
License: AGPL-3.0
|
||||
Group: BLAH
|
||||
Group: Applications/Engineering
|
||||
Url: http://github.com/Ultimaker/CuraEngine
|
||||
Source0: https://github.com/Ultimaker/CuraEngine/archive/%{version}/CuraEngine-%{version}.tar.xz
|
||||
Source1: CuraEngine.1
|
||||
Patch1: fix-build.patch
|
||||
BuildRequires: gcc6-c++
|
||||
#!BuildIgnore: libgcc_s1
|
||||
# On TW/Factory or Leap/SLE 15 use latest gcc, gcc5 otherwise
|
||||
%if 0%{?suse_version} <= 1320
|
||||
BuildRequires: gcc5-c++
|
||||
%else
|
||||
BuildRequires: gcc-c++ >= 5
|
||||
%endif
|
||||
BuildRequires: cmake
|
||||
BuildRequires: libArcus-devel
|
||||
|
||||
@ -41,12 +45,11 @@ It is part of the larger open source project called "Cura".
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
%if 0%{?suse_version} < 1500
|
||||
export CC=gcc-6
|
||||
export CXX=g++-6
|
||||
%if 0%{?suse_version} <= 1320
|
||||
export CXX="g++-5"
|
||||
export CC="gcc-5"
|
||||
%endif
|
||||
%cmake -DCMAKE_C_FLAGS="%{optflags} -fPIC" \
|
||||
-DCMAKE_CXX_FLAGS="%{optflags} -fPIC -fpermissive"
|
||||
%cmake -DCMAKE_POSITION_INDEPENDENT_CODE="true"
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
@ -60,7 +63,7 @@ install -Dm0755 lib_CuraEngine.so %{buildroot}%{_libdir}/lib_CuraEngine.so
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%_bindir/CuraEngine
|
||||
%_libdir/*
|
||||
%_libdir/lib*
|
||||
%_mandir/man1/CuraEngine.1*
|
||||
|
||||
%changelog
|
||||
|
Loading…
x
Reference in New Issue
Block a user