Accepting request 316024 from home:bmwiedemann:branches:games

add -fpermissive to allow for spidermonkey to auto-typecast a nullptr to bool

(with some useless auto-reordering)

OBS-URL: https://build.opensuse.org/request/show/316024
OBS-URL: https://build.opensuse.org/package/show/games/0ad?expand=0&rev=54
This commit is contained in:
Matthias Mailänder 2015-07-11 15:04:42 +00:00 committed by Git OBS Bridge
parent 88d664fc03
commit f0654b272b

View File

@ -21,35 +21,35 @@ Version: 0.0.18
Release: 0 Release: 0
Url: http://play0ad.com/ Url: http://play0ad.com/
Source: http://sourceforge.net/projects/zero-ad/files/releases/%{name}-%{version}-alpha-unix-build.tar.xz Source: http://sourceforge.net/projects/zero-ad/files/releases/%{name}-%{version}-alpha-unix-build.tar.xz
BuildRequires: pkgconfig(IL)
BuildRequires: boost-devel BuildRequires: boost-devel
BuildRequires: cmake BuildRequires: cmake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig(icu-i18n)
BuildRequires: mozilla-nspr-devel BuildRequires: mozilla-nspr-devel
BuildRequires: xz BuildRequires: xz
BuildRequires: pkgconfig(IL)
BuildRequires: pkgconfig(icu-i18n)
BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(zlib)
%if 0%{?suse_version} >= 1220 %if 0%{?suse_version} >= 1220
BuildRequires: libXcursor-devel BuildRequires: libXcursor-devel
%endif %endif
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(gloox)
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
BuildRequires: libminiupnpc-devel BuildRequires: libminiupnpc-devel
BuildRequires: libpng-devel BuildRequires: libpng-devel
BuildRequires: pkgconfig(vorbis)
BuildRequires: nasm BuildRequires: nasm
BuildRequires: python BuildRequires: python
BuildRequires: subversion BuildRequires: subversion
BuildRequires: zip BuildRequires: zip
BuildRequires: pkgconfig(gloox)
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(vorbis)
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: pkgconfig(libenet)
BuildRequires: pkgconfig(openal)
BuildRequires: pkg-config BuildRequires: pkg-config
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: pkgconfig(libenet)
BuildRequires: pkgconfig(openal)
%if 0%{?suse_version} >= 1140 %if 0%{?suse_version} >= 1140
BuildRequires: wxWidgets-wxcontainer-devel BuildRequires: wxWidgets-wxcontainer-devel
@ -115,7 +115,7 @@ history.
%build %build
export CFLAGS="%{optflags}" export CFLAGS="%{optflags}"
export CPPFLAGS="%{optflags}" export CPPFLAGS="%{optflags} -fpermissive"
build/workspaces/update-workspaces.sh %{?_smp_mflags} --bindir=%{_bindir} --datadir=%{_datadir}/%{name} --libdir=%{_libdir}/%{name} build/workspaces/update-workspaces.sh %{?_smp_mflags} --bindir=%{_bindir} --datadir=%{_datadir}/%{name} --libdir=%{_libdir}/%{name}
pushd build/workspaces/gcc pushd build/workspaces/gcc
make verbose=1 %{?_smp_mflags} make verbose=1 %{?_smp_mflags}