[packages/scummvm] No need to redeclare -DDYNAMIC_MODULES Use -fpermissive when buildine tools to fix conflict between

baggins baggins at pld-linux.org
Wed Jul 11 11:09:20 CEST 2012


commit d3ede7c0e164fd6be5ea325e692eeb7fca31ce40
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Jul 11 11:08:32 2012 +0200

    No need to redeclare -DDYNAMIC_MODULES
    Use -fpermissive when buildine tools to fix conflict between
    gcc 4.7 and boost.

 scummvm.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/scummvm.spec b/scummvm.spec
index 7579fb8..b56003d 100644
--- a/scummvm.spec
+++ b/scummvm.spec
@@ -570,7 +570,7 @@ cd ..
 
 %{__make} \
 	CXX="%{__cxx}" \
-	CXXFLAGS="%{rpmcppflags} %{rpmcflags} -DDYNAMIC_MODULES -fpic $(wx-gtk2-unicode-config --cppflags)" \
+	CXXFLAGS="%{rpmcppflags} %{rpmcflags} -fpic $(wx-gtk2-unicode-config --cppflags)" \
 	LDFLAGS="%{rpmcflags} %{rpmldflags}"
 
 cd scummvm-tools-%{version_tools}
@@ -580,7 +580,7 @@ cd scummvm-tools-%{version_tools}
 
 %{__make} \
 	CXX="%{__cxx}" \
-	CXXFLAGS="%{rpmcppflags} %{rpmcflags} -DUNIX $(wx-gtk2-unicode-config --cppflags)" \
+	CXXFLAGS="%{rpmcppflags} %{rpmcflags} -DUNIX -fpermissive $(wx-gtk2-unicode-config --cppflags)" \
 	LDFLAGS="%{rpmcflags} %{rpmldflags} $(wx-gtk2-unicode-config --libs)"
 
 %install


More information about the pld-cvs-commit mailing list