Author: belegdol Update of /cvs/nonfree/rpms/qmc2/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv29351 Modified Files: qmc2.spec Added Files: qmc2-cflags.patch Log Message: - Worked around RH bug 532763 for Fedora 12 and above - Added Fedora 12 config qmc2-cflags.patch: --- NEW FILE qmc2-cflags.patch --- Index: Makefile =================================================================== --- Makefile (wersja 1785) +++ Makefile (wersja 1786) @@ -210,6 +210,16 @@ FADER_SPEED = 500 endif +# CC_FLAGS: additional flags passed to the C compiler +ifndef CC_FLAGS +CC_FLAGS = +endif + +# CXX_FLAGS: additional flags passed to the C++ compiler +ifndef CXX_FLAGS +CXX_FLAGS = +endif + # >>> END OF MAKE OPTIONS <<< # emulator target fallback for mameuifx32 @@ -357,6 +367,22 @@ DISTCC=0 endif +# C++ flags +ifdef QMAKE_CXX_FLAGS +undef QMAKE_CXX_FLAGS +endif +ifneq '$(CXX_FLAGS)' '' +QMAKE_CXX_FLAGS += QMAKE_CXXFLAGS=$(CXX_FLAGS) +endif + +# C flags +ifdef QMAKE_CC_FLAGS +undef QMAKE_CC_FLAGS +endif +ifneq '$(CC_FLAGS)' '' +QMAKE_CC_FLAGS += QMAKE_CFLAGS_RELEASE=$(CC_FLAGS) +endif + # targets/rules all: $(PROJECT)-bin @@ -400,7 +426,7 @@ $(QMAKEFILE): $(PROJECT).pro @echo "Configuring build of QMC2 v$(VERSION)" @$(shell scripts/setup_imgset.sh "$(IMGSET)" "$(RM)" "$(LN)" "$(BASENAME)" > /dev/null) - @$(QMAKE) -makefile VERSION=$(VERSION) VER_MAJ=$(VERSION_MAJOR) VER_MIN=$(VERSION_MINOR) QMC2_PRETTY_COMPILE=$(PRETTY) $(QMAKE_CONF) $(SDL_LIBS) $(QT_CONF) $(QMAKE_CXX_COMPILER) '$(DEFINES)' -o Makefile.qmake $< > /dev/null + @$(QMAKE) -makefile VERSION=$(VERSION) VER_MAJ=$(VERSION_MAJOR) VER_MIN=$(VERSION_MINOR) QMC2_PRETTY_COMPILE=$(PRETTY) $(QMAKE_CONF) $(SDL_LIBS) $(QT_CONF) $(QMAKE_CXX_COMPILER) $(QMAKE_CXX_FLAGS) $(QMAKE_CC_FLAGS) '$(DEFINES)' -o Makefile.qmake $< > /dev/null else $(PROJECT)-bin: lang $(QMAKEFILE) ifeq '$(ARCH)' 'Darwin' @@ -429,7 +455,7 @@ $(QMAKEFILE): $(PROJECT).pro @echo "Configuring build of QMC2 v$(VERSION)" @$(shell scripts/setup_imgset.sh "$(IMGSET)" "$(RM)" "$(LN)" "$(BASENAME)") - $(QMAKE) -makefile VERSION=$(VERSION) VER_MAJ=$(VERSION_MAJOR) VER_MIN=$(VERSION_MINOR) QMC2_PRETTY_COMPILE=$(PRETTY) $(QMAKE_CONF) $(SDL_LIBS) $(QT_CONF) $(QMAKE_CXX_COMPILER) '$(DEFINES)' -o Makefile.qmake $< + $(QMAKE) -makefile VERSION=$(VERSION) VER_MAJ=$(VERSION_MAJOR) VER_MIN=$(VERSION_MINOR) QMC2_PRETTY_COMPILE=$(PRETTY) $(QMAKE_CONF) $(SDL_LIBS) $(QT_CONF) $(QMAKE_CXX_COMPILER) $(QMAKE_CXX_FLAGS) $(QMAKE_CC_FLAGS) '$(DEFINES)' -o Makefile.qmake $< endif install: bin @@ -588,6 +614,8 @@ @echo "BASENAME=<basename> UNIX command basename $(BASENAME)" @echo "BINDIR=<bindir> Binary directory for installation $(BINDIR)" @echo "BROWSER_EXTRAS=<ena> Enable browser extra features (0, 1) $(BROWSER_EXTRAS)" + @echo "CC_FLAGS=<c_flags> Additional flags passed to the C compiler $(CC_FLAGS)" + @echo "CXX_FLAGS=<cxx_flags> Additional flags passed to the C++ compiler $(CXX_FLAGS)" @echo "CCACHE=<ccache> Use a compiler cache (0, 1) $(CCACHE)" @echo "CCACHE_CC=<cc> Command used for cached cc $(CCACHE_CC)" @echo "CCACHE_CXX=<cxx> Command used for cached c++ $(CCACHE_CXX)" Index: qmc2.spec =================================================================== RCS file: /cvs/nonfree/rpms/qmc2/devel/qmc2.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- qmc2.spec 1 Nov 2009 16:23:35 -0000 1.20 +++ qmc2.spec 16 Nov 2009 15:33:35 -0000 1.21 @@ -10,6 +10,7 @@ URL: http://qmc2.arcadehits.net/ Source0: http://dl.sourceforge.net/qmc2/%{name}-%{version}.%{beta}.tar.bz2 Patch1: qmc2-ini.patch +Patch2: qmc2-cflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -59,14 +60,21 @@ pushd sdlmess %patch1 -p0 -b .ini~ +%patch2 -p0 -b .cflags +mv arch/Linux/Fedora_release_11.92.cfg arch/Linux/Fedora_release_12.cfg popd pushd sdlmame %patch1 -p0 -b .ini~ +%patch2 -p0 -b .cflags +mv arch/Linux/Fedora_release_11.92.cfg arch/Linux/Fedora_release_12.cfg popd %build +%if 0%{?fedora} >= 12 +export CXX_FLAGS=-fno-var-tracking-assignments +%endif pushd sdlmess QTDIR=%{_prefix} make %{?_smp_mflags} CTIME=0 DISTCFG=1\ PRETTY=0 PREFIX=%{_prefix} SYSCONFDIR=%{_sysconfdir} \ @@ -140,8 +148,10 @@ %changelog -* Sun Nov 01 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.2-0.16.b12 +* Mon Nov 16 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.2-0.16.b12 - Updated to 0.2b12 +- Worked around RH bug 532763 for Fedora 12 and above +- Added Fedora 12 config * Fri Sep 11 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.2-0.15.b11 - Updated to 0.2b11