diff options
| -rw-r--r-- | .cvsignore | 6 | ||||
| -rw-r--r-- | erlang.spec | 17 | ||||
| -rw-r--r-- | otp-null.patch | 11 | ||||
| -rw-r--r-- | otp-rpath.patch | 25 | ||||
| -rw-r--r-- | sources | 6 |
5 files changed, 42 insertions, 23 deletions
@@ -1,3 +1,3 @@ -otp_src_R12B-1.tar.gz -otp_doc_man_R12B-1.tar.gz -otp_doc_html_R12B-1.tar.gz +otp_src_R12B-4.tar.gz +otp_doc_html_R12B-4.tar.gz +otp_doc_man_R12B-4.tar.gz diff --git a/erlang.spec b/erlang.spec index 38cc2e2..f1dff09 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,14 +1,14 @@ Name: erlang Version: R12B -Release: 1.1%{?dist} +Release: 4.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages License: Erlang Public License URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_R12B-1.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_R12B-1.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_R12B-1.tar.gz +Source: http://www.erlang.org/download/otp_src_R12B-4.tar.gz +Source1: http://www.erlang.org/download/otp_doc_html_R12B-4.tar.gz +Source2: http://www.erlang.org/download/otp_doc_man_R12B-4.tar.gz Patch0: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch @@ -20,6 +20,7 @@ BuildRequires: openssl-devel BuildRequires: unixODBC-devel BuildRequires: tcl-devel BuildRequires: tk-devel +BuildRequires: gd-devel BuildRequires: java-1.5.0-gcj-devel BuildRequires: flex BuildRequires: m4 @@ -42,17 +43,18 @@ Documentation for Erlang. %prep -%setup -q -n otp_src_R12B-1 +%setup -q -n otp_src_R12B-4 %patch0 -p1 -b .links %patch1 -p1 -b .install %patch2 -p1 -b .rpath %patch3 -p1 -b .sslrpath + # enable dynamic linking for ssl sed -i 's|SSL_DYNAMIC_ONLY=no|SSL_DYNAMIC_ONLY=yes|' erts/configure sed -i 's|^LD.*=.*|LD = gcc -shared|' lib/common_test/c_src/Makefile %build -./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} +CFLAGS="-fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} chmod -R u+w . make @@ -107,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Oct 25 2008 Gerard Milmeister <gemi@bluewin.ch> - R12B-4.1 +- new release R12B-4 + * Thu Mar 27 2008 Gerard Milmeister <gemi@bluewin.ch> - R12B-1.1 - new release R12B-1 diff --git a/otp-null.patch b/otp-null.patch new file mode 100644 index 0000000..77a0a72 --- /dev/null +++ b/otp-null.patch @@ -0,0 +1,11 @@ +diff -up otp_src_R12B-0/lib/orber/c_src/setsockaddr_in.c.null otp_src_R12B-0/lib/orber/c_src/setsockaddr_in.c +--- otp_src_R12B-0/lib/orber/c_src/setsockaddr_in.c.null 2008-02-23 13:46:52.000000000 +0100 ++++ otp_src_R12B-0/lib/orber/c_src/setsockaddr_in.c 2008-02-23 13:47:15.000000000 +0100 +@@ -17,6 +17,7 @@ + * $Id: otp-null.patch,v 1.1 2008/10/25 21:52:10 gemi Exp $ + * + */ ++#include <stdlib.h> + #include "inet.h" + + #ifdef HAVE_CONFIG_H diff --git a/otp-rpath.patch b/otp-rpath.patch index 9e82e62..95d38d2 100644 --- a/otp-rpath.patch +++ b/otp-rpath.patch @@ -1,17 +1,19 @@ ---- otp_src_R10B-8/lib/crypto/c_src/Makefile.in.rpath 2005-10-29 22:50:59.000000000 +0200 -+++ otp_src_R10B-8/lib/crypto/c_src/Makefile.in 2005-10-29 22:51:23.000000000 +0200 -@@ -79,7 +79,7 @@ - ifeq ($(HOST_OS),) +diff -up otp_src_R12B-4/lib/crypto/c_src/Makefile.in.rpath otp_src_R12B-4/lib/crypto/c_src/Makefile.in +--- otp_src_R12B-4/lib/crypto/c_src/Makefile.in.rpath 2008-10-25 22:20:42.000000000 +0200 ++++ otp_src_R12B-4/lib/crypto/c_src/Makefile.in 2008-10-25 22:20:59.000000000 +0200 +@@ -80,7 +80,7 @@ ifeq ($(HOST_OS),) HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess) endif + DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ -LD_R_FLAG=@DED_LD_FLAG_RUNTIME_LIBRARY_PATH@ +LD_R_FLAG= ifeq ($(strip $(LD_R_FLAG)),) LD_R_OPT = else ---- otp_src_R10B-8/lib/crypto/priv/Makefile.rpath 2005-10-29 22:52:01.000000000 +0200 -+++ otp_src_R10B-8/lib/crypto/priv/Makefile 2005-10-29 22:52:32.000000000 +0200 -@@ -60,7 +60,7 @@ +diff -up otp_src_R12B-4/lib/crypto/priv/Makefile.rpath otp_src_R12B-4/lib/crypto/priv/Makefile +--- otp_src_R12B-4/lib/crypto/priv/Makefile.rpath 2008-10-25 22:21:11.000000000 +0200 ++++ otp_src_R12B-4/lib/crypto/priv/Makefile 2008-10-25 22:21:33.000000000 +0200 +@@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto_drv.o # ---------------------------------------------------- $(SO_DRIVER): $(OBJS) @@ -20,9 +22,10 @@ -o $@ $^ -lcrypto $(DLL_DRIVER): $(OBJS) ---- otp_src_R10B-8/lib/ssl/c_src/Makefile.in.rpath 2005-10-29 22:53:15.000000000 +0200 -+++ otp_src_R10B-8/lib/ssl/c_src/Makefile.in 2005-10-29 22:53:50.000000000 +0200 -@@ -104,9 +104,9 @@ +diff -up otp_src_R12B-4/lib/ssl/c_src/Makefile.in.rpath otp_src_R12B-4/lib/ssl/c_src/Makefile.in +--- otp_src_R12B-4/lib/ssl/c_src/Makefile.in.rpath 2008-10-25 22:21:51.000000000 +0200 ++++ otp_src_R12B-4/lib/ssl/c_src/Makefile.in 2008-10-25 22:22:21.000000000 +0200 +@@ -111,9 +111,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar CC_R_FLAG = else ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath, @@ -33,4 +36,4 @@ +CC_R_FLAG = endif endif - + endif @@ -1,3 +1,3 @@ -6de3630b446e9c2150edfe01e383c917 otp_src_R12B-1.tar.gz -96da62bcfb40e5d3ec2945bb2b050024 otp_doc_man_R12B-1.tar.gz -3dd8aee17fcbd3e5fda7313208fce6ac otp_doc_html_R12B-1.tar.gz +ae81edda4a17506af7a9d73abca033b2 otp_src_R12B-4.tar.gz +f633cd418d8260af7a11c998aa88072b otp_doc_html_R12B-4.tar.gz +ef8f96d1721a2345cc87b208cde3de06 otp_doc_man_R12B-4.tar.gz |