Link with -static-libstdc++
This commit is contained in:
parent
c2d8b7ea80
commit
3091965dad
18
mesa.spec
18
mesa.spec
@ -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: 1.%{git}%{?dist}
|
Release: 2.%{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,8 @@ 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,6 +407,14 @@ export CXXFLAGS="$RPM_OPT_FLAGS %{?with_opencl:-frtti -fexceptions} %{!?with_ope
|
|||||||
%endif
|
%endif
|
||||||
%{?dri_drivers}
|
%{?dri_drivers}
|
||||||
|
|
||||||
|
# libtool refuses to pass through things you ask for in LDFLAGS that it doesn't
|
||||||
|
# know about, like -static-libstdc++, so...
|
||||||
|
sed -i 's/-fuse-linker-plugin|/-static-lib*|&/' libtool
|
||||||
|
sed -i 's/-nostdlib//g' libtool
|
||||||
|
sed -i 's/^predep_objects=.*$/#&/' libtool
|
||||||
|
sed -i 's/^postdep_objects=.*$/#&/' libtool
|
||||||
|
sed -i 's/^postdeps=.*$/#&/' libtool
|
||||||
|
|
||||||
make %{?_smp_mflags} MKDEP=/bin/true
|
make %{?_smp_mflags} MKDEP=/bin/true
|
||||||
|
|
||||||
%install
|
%install
|
||||||
@ -434,6 +445,8 @@ pushd $RPM_BUILD_ROOT%{_libdir}
|
|||||||
for i in libOSMesa*.so libGL.so ; do
|
for i in libOSMesa*.so libGL.so ; do
|
||||||
eu-findtextrel $i && exit 1
|
eu-findtextrel $i && exit 1
|
||||||
done
|
done
|
||||||
|
# check that we really didn't link libstdc++ dynamically
|
||||||
|
eu-readelf -d i965_dri.so | grep -q libstdc && exit 1
|
||||||
popd
|
popd
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
@ -675,6 +688,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jan 08 2016 Adam Jackson <ajax@redhat.com> 11.1.0-2
|
||||||
|
- Link with -static-libstdc++
|
||||||
|
|
||||||
* Fri Dec 18 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 11.1.0-1.20151218
|
* Fri Dec 18 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 11.1.0-1.20151218
|
||||||
- 11.1.0
|
- 11.1.0
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user