rpms/mesa
7
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/mesa.git synced 2024-11-28 11:06:25 +00:00
Code Issues 12 Projects Releases Packages Wiki Activity Actions

Link with -static-libstdc++ to work around Steam bundling its own copy

Browse source
This commit is contained in:
Adam Jackson 2015-11-05 12:04:28 -05:00
parent 30857cce6c
commit e443b9d877
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
mesa.spec
View file

@ -55,7 +55,7 @@
Summary: Mesa graphics libraries Summary: Mesa graphics libraries
Name: mesa Name: mesa
Version: 11.1.0 Version: 11.1.0
Release: 0.devel.11.%{git}%{?dist} Release: 0.devel.12.%{git}%{?dist}
License: MIT License: MIT
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.mesa3d.org URL: http://www.mesa3d.org
@ -130,6 +130,7 @@ BuildRequires: libomxil-bellagio-devel
BuildRequires: libclc-devel llvm-static opencl-filesystem BuildRequires: libclc-devel llvm-static opencl-filesystem
%endif %endif
BuildRequires: python-mako BuildRequires: python-mako
BuildRequires: libstdc++-static
%description %description
Mesa Mesa
@ -366,6 +367,7 @@ export CFLAGS="$RPM_OPT_FLAGS"
# We do say 'catch' in the clover and d3d1x state trackers, but we're not # We do say 'catch' in the clover and d3d1x state trackers, but we're not
# building those yet. # building those yet.
export CXXFLAGS="$RPM_OPT_FLAGS %{?with_opencl:-frtti -fexceptions} %{!?with_opencl:-fno-rtti -fno-exceptions}" export CXXFLAGS="$RPM_OPT_FLAGS %{?with_opencl:-frtti -fexceptions} %{!?with_opencl:-fno-rtti -fno-exceptions}"
export LDFLAGS="%{__global_ldflags} -static-libstdc++"
%ifarch %{ix86} %ifarch %{ix86}
# i do not have words for how much the assembly dispatch code infuriates me # i do not have words for how much the assembly dispatch code infuriates me
%define asm_flags --disable-asm %define asm_flags --disable-asm
@ -404,7 +406,10 @@ export CXXFLAGS="$RPM_OPT_FLAGS %{?with_opencl:-frtti -fexceptions} %{!?with_ope
%endif %endif
%{?dri_drivers} %{?dri_drivers}
make %{?_smp_mflags} MKDEP=/bin/true # libtool refuses to pass through things you ask for in LDFLAGS that it doesn't
# know about, like -static-libstdc++, so...
sed -i 's/-kthread|/-static-libstdc++|&/' libtool
make %{?_smp_mflags} MKDEP=/bin/true V=1
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -676,6 +681,9 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%changelog %changelog
* Thu Nov 05 2015 Adam Jackson <ajax@redhat.com> 11.1.0-0.devel.12.3994ef5
- Link with -static-libstdc++ to work around Steam bundling its own copy
* Fri Oct 23 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 11.1.0-0.devel.11.3994ef5 * Fri Oct 23 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 11.1.0-0.devel.11.3994ef5
- 3994ef5 - 3994ef5
- Enable VirGL driver - Enable VirGL driver