From df4b7d35e9e8d7c5ddd933be10b0b1d0e4e8285d Mon Sep 17 00:00:00 2001 From: GĂ©rard Milmeister Date: Mar 13 2006 16:18:42 +0000 Subject: *** empty log message *** --- diff --git a/erlang.spec b/erlang.spec index e8a3f95..1fcee65 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,6 +1,6 @@ Name: erlang Version: R10B -Release: 10.1%{?dist} +Release: 10.2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -13,6 +13,7 @@ Patch: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch Patch3: otp-sslrpath.patch +Patch4: otp-glibc24.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -46,6 +47,7 @@ Documentation for Erlang. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build diff --git a/otp-glibc24.patch b/otp-glibc24.patch index f2763e5..4875e65 100644 --- a/otp-glibc24.patch +++ b/otp-glibc24.patch @@ -1,11 +1,11 @@ ---- otp_src_R10B-6/erts/emulator/hipe/hipe_x86_signal.c.glibc24 2005-09-06 22:01:13.000000000 +0200 -+++ otp_src_R10B-6/erts/emulator/hipe/hipe_x86_signal.c 2005-09-06 22:01:36.000000000 +0200 +--- otp_src_R10B-10/erts/emulator/hipe/hipe_x86_signal.c.glibc24 2006-03-13 17:16:39.000000000 +0100 ++++ otp_src_R10B-10/erts/emulator/hipe/hipe_x86_signal.c 2006-03-13 17:17:11.000000000 +0100 @@ -27,7 +27,7 @@ #include #include "hipe_signal.h" -#if __GLIBC__ == 2 && __GLIBC_MINOR__ == 3 -+#if __GLIBC__ == 2 && (__GLIBC_MINOR__ == 3 || __GLIBC_MINOR__ == 4) ++#if __GLIBC__ == 2 && __GLIBC_MINOR__ == 4 /* See comment below for glibc 2.2. */ + #ifndef __USE_GNU #define __USE_GNU /* to un-hide RTLD_NEXT */ - #include