SHA256
1
0
forked from pool/texstudio

Accepting request 561450 from home:StefanBruens:branches:Publishing

- Disable crash handler on aarch64/armv6l/armv7l, aarch64 is
  not implemented and armv6l/armv7l is broken
- use %qmake5 macro to supply CXXFLAGS and also CFLAGS

OBS-URL: https://build.opensuse.org/request/show/561450
OBS-URL: https://build.opensuse.org/package/show/Publishing/texstudio?expand=0&rev=28
This commit is contained in:
Martin Pluskal 2018-01-04 08:02:03 +00:00 committed by Git OBS Bridge
parent 5d810cea56
commit 6f87f40478
2 changed files with 19 additions and 6 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Jan 3 13:37:25 UTC 2018 - stefan.bruens@rwth-aachen.de
- Disable crash handler on aarch64/armv6l/armv7l, aarch64 is
not implemented and armv6l/armv7l is broken
- use %qmake5 macro to supply CXXFLAGS and also CFLAGS
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Aug 22 19:25:53 UTC 2017 - dmitry_r@opensuse.org Tue Aug 22 19:25:53 UTC 2017 - dmitry_r@opensuse.org

View File

@ -1,7 +1,7 @@
# #
# spec file for package texstudio # spec file for package texstudio
# #
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -53,13 +53,19 @@ syntax highlighting, automatically code completion and more.
%setup -q -n %{name}%{version} %setup -q -n %{name}%{version}
%build %build
%if 0%{?suse_version} <= 1320 %ifarch aarch64 %{arm}
qmake QMAKE_CXXFLAGS="%optflags -fno-strict-aliasing" CONFIG-=debug texstudio.pro %define crashhandler NO_CRASH_HANDLER=true
%else
qmake-qt5 QMAKE_CXXFLAGS="%optflags -fno-strict-aliasing" CONFIG-=debug texstudio.pro
%endif %endif
make %{?_smp_mflags} %if 0%{?suse_version} <= 1320
qmake QMAKE_CXXFLAGS="%optflags -fno-strict-aliasing" \
QMAKE_CFLAGS="%optflags -fno-strict-aliasing" \
CONFIG-=debug texstudio.pro
%else
%{qmake5} CONFIG-=debug %{?crashhandler} texstudio.pro
%endif
%{make_jobs}
%install %install
make INSTALL_ROOT=%{buildroot} install make INSTALL_ROOT=%{buildroot} install