[gxemul] fix compile
Tom Callaway
spot at fedoraproject.org
Mon Jan 23 04:35:52 UTC 2012
commit 02543709c06ab2e4025dac69e39e618c6d49d12a
Author: Tom Callaway <spot at fedoraproject.org>
Date: Sun Jan 22 23:35:50 2012 -0500
fix compile
gxemul-0.6.0-gcc47.patch | 12 ++++++++++++
gxemul.spec | 15 ++++++---------
2 files changed, 18 insertions(+), 9 deletions(-)
---
diff --git a/gxemul-0.6.0-gcc47.patch b/gxemul-0.6.0-gcc47.patch
new file mode 100644
index 0000000..3fb0520
--- /dev/null
+++ b/gxemul-0.6.0-gcc47.patch
@@ -0,0 +1,12 @@
+diff -up gxemul-0.6.0/src/include/refcount_ptr.h.gcc47 gxemul-0.6.0/src/include/refcount_ptr.h
+--- gxemul-0.6.0/src/include/refcount_ptr.h.gcc47 2012-01-22 23:21:52.816062947 -0500
++++ gxemul-0.6.0/src/include/refcount_ptr.h 2012-01-22 23:22:53.180497162 -0500
+@@ -28,6 +28,8 @@
+ * SUCH DAMAGE.
+ */
+
++#include <cstddef>
++
+ /**
+ * \brief Base class for reference countable objects.
+ *
diff --git a/gxemul.spec b/gxemul.spec
index b909a25..a1d3e87 100644
--- a/gxemul.spec
+++ b/gxemul.spec
@@ -1,12 +1,13 @@
Name: gxemul
Version: 0.6.0
-Release: 3%{?dist}
+Release: 4%{?dist}
License: BSD
Group: Development/Tools
Summary: Instruction-level machine emulator
URL: http://gxemul.sourceforge.net/
Source0: http://gxemul.sourceforge.net/src/%{name}-%{version}.tar.gz
Patch0: gxemul-0.6.0-Makefile-cleanup.patch
+Patch1: gxemul-0.6.0-gcc47.patch
BuildRequires: libX11-devel, xorg-x11-proto-devel
%description
@@ -20,6 +21,7 @@ on a real machine.
%prep
%setup -q
%patch0 -p1 -b .cleanup
+%patch1 -p1
%build
CXXFLAGS="$RPM_OPT_FLAGS" PREFIX="%{_prefix}" ./configure
@@ -28,14 +30,6 @@ make %{?_smp_mflags}
%install
make DESTDIR=%{buildroot} install
-# mkdir -p $RPM_BUILD_ROOT%{_bindir}
-# mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-# install -m755 gxemul $RPM_BUILD_ROOT%{_bindir}
-# install -m644 man/gxemul.1 $RPM_BUILD_ROOT%{_mandir}/man1
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
%defattr(-,root,root,0755)
%doc LICENSE HISTORY README demos/
@@ -44,6 +38,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/gxemul.*
%changelog
+* Sun Jan 22 2012 Tom Callaway <spot at fedoraproject.org> - 0.6.0-4
+- fix compile with gcc 4.7 (may have been an issue with 4.6 too)
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list