diff --git a/erlang.spec b/erlang.spec index 0e6437e..78b81b9 100644 --- a/erlang.spec +++ b/erlang.spec @@ -1,6 +1,6 @@ Name: erlang Version: R12B -Release: 0.2%{?dist} +Release: 0.3%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -13,6 +13,7 @@ Patch0: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch Patch3: otp-sslrpath.patch +Patch4: otp-null.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -20,6 +21,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 @@ -47,12 +49,13 @@ Documentation for Erlang. %patch1 -p1 -b .install %patch2 -p1 -b .rpath %patch3 -p1 -b .sslrpath +%patch4 -p1 -b .null # 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 +110,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Feb 23 2008 Gerard Milmeister - R12B-0.3 +- disable strict aliasing optimization + * Mon Feb 18 2008 Fedora Release Engineering - R12B-0.2 - Autorebuild for GCC 4.3 diff --git a/otp-glibc25.patch b/otp-glibc25.patch deleted file mode 100644 index b9d849d..0000000 --- a/otp-glibc25.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- otp_src_R11B-2/erts/emulator/hipe/hipe_x86_signal.c.glibc25 2006-12-30 23:57:04.000000000 +0100 -+++ otp_src_R11B-2/erts/emulator/hipe/hipe_x86_signal.c 2006-12-30 23:57:36.000000000 +0100 -@@ -34,7 +34,7 @@ - #endif - #include "hipe_signal.h" - --#if __GLIBC__ == 2 && (__GLIBC_MINOR__ == 3 || __GLIBC_MINOR__ == 4) -+#if __GLIBC__ == 2 && (__GLIBC_MINOR__ == 3 || __GLIBC_MINOR__ == 4 || __GLIBC_MINOR__ == 5) - /* See comment below for glibc 2.2. */ - #ifndef __USE_GNU - #define __USE_GNU /* to un-hide RTLD_NEXT */ diff --git a/otp-null.patch b/otp-null.patch new file mode 100644 index 0000000..b84d499 --- /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/02/23 13:41:16 gemi Exp $ + * + */ ++#include + #include "inet.h" + + #ifdef HAVE_CONFIG_H diff --git a/otp-run_erl.patch b/otp-run_erl.patch deleted file mode 100644 index 7629a75..0000000 --- a/otp-run_erl.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- otp_src_R10B-10/erts/etc/unix/run_erl.c.bak 2006-05-03 15:54:19.000000000 +0200 -+++ otp_src_R10B-10/erts/etc/unix/run_erl.c 2006-05-03 15:57:36.000000000 +0200 -@@ -42,6 +42,8 @@ - #include - #include - #include -+#include -+#include - #if !defined(NO_SYSLOG) - #include - #endif -@@ -803,6 +805,7 @@ - static int open_pty_master(char **ptyslave) - { - int mfd; -+ int sfd; - char *major, *minor; - - static char majorchars[] = "pqrstuvwxyzabcdePQRSTUVWXYZABCDE"; -@@ -818,6 +821,15 @@ - /* http://www.xcf.berkeley.edu/~ali/K0D/UNIX/PTY/code/upty.h.html */ - - { -+ static char ttyname[] = " "; -+ if (0 == openpty(&mfd, &sfd, ttyname, NULL, NULL)) { -+ close(sfd); -+ *ptyslave = ttyname; -+ return mfd; -+ } -+ } -+ -+ { - /* New style devpts or devfs /dev/pty/{m,s}{0,1....} */ - - static char ptyname[] = "/dev/pty/mX"; ---- otp_src_R10B-10/erts/etc/common/Makefile.in.orig 2006-05-03 17:08:53.000000000 +0200 -+++ otp_src_R10B-10/erts/etc/common/Makefile.in 2006-05-03 17:10:18.000000000 +0200 -@@ -241,7 +241,7 @@ - $(PURIFY) $(LD) $(LDFLAGS) $(ENTRY_LDFLAGS) -o $@ $(OBJDIR)/inet_gethost.o $(ENTRY_OBJ) $(LIBS) - - $(BINDIR)/run_erl: $(OBJDIR)/run_erl.o -- $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/run_erl.o -+ $(LD) $(LDFLAGS) -lutil -o $@ $(OBJDIR)/run_erl.o - - $(OBJDIR)/run_erl.o: ../unix/run_erl.c - $(CC) $(CFLAGS) -o $@ -c ../unix/run_erl.c