Do not use local valgrind.h bundled (#1141464)
This commit is contained in:
parent
e3bc13a112
commit
9cf44b9c81
15
0ad-valgrind.patch
Normal file
15
0ad-valgrind.patch
Normal file
@ -0,0 +1,15 @@
|
||||
diff -up 0ad-0.0.16-alpha/build/premake/extern_libs4.lua.orig 0ad-0.0.16-alpha/build/premake/extern_libs4.lua
|
||||
--- 0ad-0.0.16-alpha/build/premake/extern_libs4.lua.orig 2014-09-14 11:05:13.723088670 -0300
|
||||
+++ 0ad-0.0.16-alpha/build/premake/extern_libs4.lua 2014-09-14 11:05:33.262089418 -0300
|
||||
@@ -667,10 +667,7 @@ extern_lib_defs = {
|
||||
},
|
||||
valgrind = {
|
||||
compile_settings = function()
|
||||
- add_source_include_paths("valgrind")
|
||||
- end,
|
||||
- link_settings = function()
|
||||
- add_source_lib_paths("valgrind")
|
||||
+ pkgconfig_cflags("valgrind")
|
||||
end,
|
||||
},
|
||||
vorbis = {
|
11
0ad.spec
11
0ad.spec
@ -19,7 +19,7 @@
|
||||
|
||||
Name: 0ad
|
||||
Version: 0.0.16
|
||||
Release: 10%{?dist}
|
||||
Release: 11%{?dist}
|
||||
# BSD License:
|
||||
# build/premake/*
|
||||
# libraries/valgrind/* (not built/used)
|
||||
@ -109,6 +109,9 @@ Patch2: %{name}-miniupnpc.patch
|
||||
# http://trac.wildfiregames.com/changeset/15334
|
||||
Patch3: changeset_15334.diff
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1141464
|
||||
Patch4: %{name}-valgrind.patch
|
||||
|
||||
%description
|
||||
0 A.D. (pronounced "zero ey-dee") is a free, open-source, cross-platform
|
||||
real-time strategy (RTS) game of ancient warfare. In short, it is a
|
||||
@ -131,11 +134,14 @@ hobbyist game developers, since 2001.
|
||||
%endif
|
||||
%patch2 -p1
|
||||
%patch3 -p3
|
||||
%patch4 -p1
|
||||
|
||||
%if %{with_system_nvtt}
|
||||
rm -fr libraries/nvtt
|
||||
%endif
|
||||
|
||||
rm -fr libraries/source/valgrind
|
||||
|
||||
#-----------------------------------------------------------------------
|
||||
%build
|
||||
export CFLAGS="%{optflags}"
|
||||
@ -225,6 +231,9 @@ export STRIP=/bin/true
|
||||
%{_mandir}/man6/*.6*
|
||||
|
||||
%changelog
|
||||
* Sun Sep 14 2014 pcpa <paulo.cesar.pereira.de.andrade@gmail.com> - 0.0.16-11
|
||||
- Remove unused valgrind sources and use system valgrind.h (#1141464)
|
||||
|
||||
* Thu Aug 28 2014 David Tardon <dtardon@redhat.com> - 0.0.16-10
|
||||
- rebuild for ICU 53.1
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user