From 7c83cc4679044dc018ae3d0ec8b1af5acf4ffcbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Wed, 23 Mar 2011 19:57:54 +0100 Subject: [PATCH 1/2] rebuilt for mysql 5.5.10 (soname bump in libmysqlclient) --- yap.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yap.spec b/yap.spec index 75821dc..c1e0256 100644 --- a/yap.spec +++ b/yap.spec @@ -4,7 +4,7 @@ Name: yap Version: 6.2.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: High-performance Prolog Compiler Group: Development/Languages # README Perl Artistic license 2 and the FSF's LGPL @@ -224,6 +224,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Mar 23 2011 Dan Horák - 6.2.0-3 +- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient) + * Tue Feb 08 2011 Fedora Release Engineering - 6.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 51ddb636941b7b332bd7fb876f76f48702898d13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Thu, 23 Jun 2011 15:29:50 +0200 Subject: [PATCH 2/2] fix non-x86 builds with recent gcc Conflicts: yap.spec --- yap-6.2.0-gprof-macro.patch | 14 ++++++++++++++ yap.spec | 8 +++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 yap-6.2.0-gprof-macro.patch diff --git a/yap-6.2.0-gprof-macro.patch b/yap-6.2.0-gprof-macro.patch new file mode 100644 index 0000000..1d18164 --- /dev/null +++ b/yap-6.2.0-gprof-macro.patch @@ -0,0 +1,14 @@ +diff -up yap-6/C/gprof.c.macro yap-6/C/gprof.c +--- yap-6/C/gprof.c.macro 2011-06-23 14:45:25.000000000 +0200 ++++ yap-6/C/gprof.c 2011-06-23 14:45:43.000000000 +0200 +@@ -102,8 +102,8 @@ typedef greg_t context_reg; + + #else + +-#define CONTEXT_PC NULL +-#define CONTEXT_BP NULL ++#define CONTEXT_PC(scv) NULL ++#define CONTEXT_BP(scv) NULL + + #endif + diff --git a/yap.spec b/yap.spec index c1e0256..910236b 100644 --- a/yap.spec +++ b/yap.spec @@ -4,7 +4,7 @@ Name: yap Version: 6.2.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: High-performance Prolog Compiler Group: Development/Languages # README Perl Artistic license 2 and the FSF's LGPL @@ -25,6 +25,8 @@ Patch6: yap-6.2.0-Install-info-pages-non-executable.patch Patch7: yap-6.2.0-Do-not-install-info-dir-index.patch # In upstream already Patch8: yap-6.2.0-fix-chr-install-from-Keri.patch +# fix non-x86 build with recent gcc +Patch9: yap-6.2.0-gprof-macro.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: autoconf BuildRequires: gmp-devel @@ -79,6 +81,7 @@ Documentation for Yap. %patch6 -p1 -b .non_executable_info %patch7 -p1 -b .do_not_install_info_index %patch8 -p1 -b .fix_chr_install +%patch9 -p1 -b .macro # remove redundant RPATH sed -i 's/-Wl,-R\(,\)\{0,1\}\\$(LIBDIR)//' configure.in @@ -224,6 +227,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jun 23 2011 Dan Horák - 6.2.0-4 +- fix non-x86 builds with recent gcc + * Wed Mar 23 2011 Dan Horák - 6.2.0-3 - rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)