rpms/erlang/EL-5 otp-rpath.patch, 1.3, 1.4 .cvsignore, 1.9, 1.10 erlang.spec, 1.21, 1.22 import.log, 1.1, 1.2 otp-sslrpath.patch, 1.1, 1.2 sources, 1.9, 1.10
Peter Lemenkov
peter at fedoraproject.org
Sat Apr 18 13:59:28 UTC 2009
- Previous message: rpms/pgp-tools/devel pgp-tools-1.1-drop-pgpring.patch, NONE, 1.1 pgp-tools.spec, 1.11, 1.12
- Next message: rpms/pgp-tools/F-9 pgp-tools-1.1-drop-pgpring.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 pgp-tools.spec, 1.9, 1.10 sources, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: peter
Update of /cvs/pkgs/rpms/erlang/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv330/EL-5
Modified Files:
.cvsignore erlang.spec import.log otp-sslrpath.patch sources
Added Files:
otp-rpath.patch
Log Message:
ver. R12B-5 (bugfix release)
otp-rpath.patch:
Index: otp-rpath.patch
===================================================================
RCS file: otp-rpath.patch
diff -N otp-rpath.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ otp-rpath.patch 18 Apr 2009 13:59:28 -0000 1.4
@@ -0,0 +1,39 @@
+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
+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)
+- $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \
++ $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \
+ -o $@ $^ -lcrypto
+
+ $(DLL_DRIVER): $(OBJS)
+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,
+-CC_R_FLAG = -Wl,-rpath,
++CC_R_FLAG =
+ else # Default: -Wl,-R
+-CC_R_FLAG = -Wl,-R
++CC_R_FLAG =
+ endif
+ endif
+ endif
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/erlang/EL-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 10 Aug 2008 21:01:20 -0000 1.9
+++ .cvsignore 18 Apr 2009 13:59:27 -0000 1.10
@@ -1,3 +1,3 @@
-otp_doc_html_R12B-3.tar.gz
-otp_doc_man_R12B-3.tar.gz
-otp_src_R12B-3.tar.gz
+otp_doc_html_R12B-5.tar.gz
+otp_doc_man_R12B-5.tar.gz
+otp_src_R12B-5.tar.gz
Index: erlang.spec
===================================================================
RCS file: /cvs/pkgs/rpms/erlang/EL-5/erlang.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- erlang.spec 11 Aug 2008 14:27:48 -0000 1.21
+++ erlang.spec 18 Apr 2009 13:59:28 -0000 1.22
@@ -1,9 +1,9 @@
%define ver R12B
-%define rel 3
+%define rel 5
Name: erlang
Version: %{ver}
-Release: %{rel}.3%{?dist}
+Release: %{rel}.6%{?dist}
Summary: General-purpose programming language and runtime environment
Group: Development/Languages
@@ -14,6 +14,7 @@
Source2: http://www.erlang.org/download/otp_doc_man_%{ver}-%{rel}.tar.gz
Patch0: otp-links.patch
Patch1: otp-install.patch
+Patch2: otp-rpath.patch
Patch3: otp-sslrpath.patch
Patch6: otp-ssl_missing_libs.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,13 +25,17 @@
BuildRequires: tcl-devel
BuildRequires: tk-devel
BuildRequires: gd-devel
+%if 0%{?rhel}
BuildRequires: java-1.4.2-gcj-compat-devel
+%else
+BuildRequires: java-1.5.0-gcj-devel
+%endif
BuildRequires: flex
BuildRequires: m4
Requires: tk
-%description
+%description
Erlang is a general-purpose programming language and runtime
environment. Erlang has built-in support for concurrency, distribution
and fault tolerance. Erlang is used in several large telecommunication
@@ -49,7 +54,8 @@
%setup -q -n otp_src_%{ver}-%{rel}
%patch0 -p1 -b .links
%patch1 -p1 -b .install
-%patch3 -p1 -b .sslrpath
+%patch2 -p1 -b .rpath
+#%patch3 -p1 -b .sslrpath
%patch6 -p0 -b .keyutils
# enable dynamic linking for ssl
@@ -64,7 +70,11 @@
%build
-CFLAGS="-fno-strict-aliasing" ./configure --enable-dynamic-ssl-lib --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir}
+%ifarch sparcv9 sparc64
+CFLAGS="-mcpu=ultrasparc -fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir}
+%else
+CFLAGS="-fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir}
+%endif
chmod -R u+w .
make
@@ -88,7 +98,7 @@
# make links to binaries
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
cd $RPM_BUILD_ROOT/%{_bindir}
-for file in erl erlc
+for file in erl erlc escript dialyzer
do
ln -sf ../%{_lib}/erlang/bin/$file .
done
@@ -119,8 +129,24 @@
%changelog
-* Mon Aug 11 2008 Peter Lemenkov <lemenkov at gmail.com> - R12B-3.3
-- Force dynamic linking of crypto libs
+* Sun Mar 1 2009 Gerard Milmeister <gemi at bluewin.ch> - R12B-5.6
+- new release R12B-5
+- link escript and dialyzer to %{_bindir}
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - R12B-5.5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Feb 14 2009 Dennis Gilmore <dennis at ausil.us> - R12B-4.5
+- fix sparc arches to compile
+
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - R12B-4.4
+- rebuild with new openssl
+
+* Sat Oct 25 2008 Gerard Milmeister <gemi at bluewin.ch> - R12B-4.1
+- new release R12B-4
+
+* Fri Sep 5 2008 Gerard Milmeister <gemi at bluewin.ch> - R12B-3.3
+- fixed sslrpath patch
* Thu Jul 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> - R12B-3.2
- fix license tag
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/erlang/EL-5/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log 10 Aug 2008 21:01:21 -0000 1.1
+++ import.log 18 Apr 2009 13:59:28 -0000 1.2
@@ -1 +1,2 @@
erlang-R12B-3_2_fc9:EL-5:erlang-R12B-3.2.fc9.src.rpm:1218402033
+erlang-R12B-5_6_fc10:EL-5:erlang-R12B-5.6.fc10.src.rpm:1240063042
otp-sslrpath.patch:
Index: otp-sslrpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/erlang/EL-5/otp-sslrpath.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- otp-sslrpath.patch 17 Feb 2006 23:32:19 -0000 1.1
+++ otp-sslrpath.patch 18 Apr 2009 13:59:28 -0000 1.2
@@ -1,7 +1,8 @@
---- otp_src_R10B-9/lib/ssl/c_src/Makefile.in.sslrpath 2005-12-29 00:49:17.000000000 +0100
-+++ otp_src_R10B-9/lib/ssl/c_src/Makefile.in 2005-12-29 00:50:15.000000000 +0100
-@@ -95,7 +95,7 @@
- endif
+diff -up otp_src_R12B-4/lib/ssl/c_src/Makefile.in.sslrpath otp_src_R12B-4/lib/ssl/c_src/Makefile.in
+--- otp_src_R12B-4/lib/ssl/c_src/Makefile.in.sslrpath 2008-10-26 00:00:37.000000000 +0200
++++ otp_src_R12B-4/lib/ssl/c_src/Makefile.in 2008-10-26 00:01:09.000000000 +0200
+@@ -102,7 +102,7 @@ else
+ SSL_MAKEFILE =
endif
-CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@
@@ -9,3 +10,15 @@
ifeq ($(findstring @,$(CC_R_FLAG)),@)
# Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@;
# we try our best here instead...
+@@ -111,9 +111,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar
+ CC_R_FLAG =
+ else
+ ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath,
+-CC_R_FLAG = -Wl,-rpath,
++CC_R_FLAG =
+ else # Default: -Wl,-R
+-CC_R_FLAG = -Wl,-R
++CC_R_FLAG =
+ endif
+ endif
+ endif
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/erlang/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 10 Aug 2008 21:01:21 -0000 1.9
+++ sources 18 Apr 2009 13:59:28 -0000 1.10
@@ -1,3 +1,3 @@
-8865d406c256abbff63eaff62d2216aa otp_doc_html_R12B-3.tar.gz
-13098954c9d5804bb8394fe7badb3d0d otp_doc_man_R12B-3.tar.gz
-c2e7f0ad54b8fadebde2d94106608d97 otp_src_R12B-3.tar.gz
+fb0c5454bbd865e881b6712295f6d41f otp_doc_html_R12B-5.tar.gz
+6231cb172847040395cc34b20781aa3b otp_doc_man_R12B-5.tar.gz
+3751ea3fea669d2b25c67eeb883734bb otp_src_R12B-5.tar.gz
- Previous message: rpms/pgp-tools/devel pgp-tools-1.1-drop-pgpring.patch, NONE, 1.1 pgp-tools.spec, 1.11, 1.12
- Next message: rpms/pgp-tools/F-9 pgp-tools-1.1-drop-pgpring.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 pgp-tools.spec, 1.9, 1.10 sources, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list