rpms/erlang
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new release R12B-4

Browse Source
This commit is contained in:
Gérard Milmeister 2008-10-25 21:49:08 +00:00
parent 985b97c64a
commit e1055a8363
5 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.cvsignore
View File

@ -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_src_R12B-4.tar.gz
otp_doc_html_R12B-4.tar.gz
otp_doc_man_R12B-4.tar.gz

9
erlang.spec
View File

@ -1,9 +1,9 @@
%define ver R12B
%define rel 3
%define rel 4
Name: erlang
Version: %{ver}
Release: %{rel}.3%{?dist}
Release: %{rel}.1%{?dist}
Summary: General-purpose programming language and runtime environment
Group: Development/Languages
@ -14,6 +14,7 @@ Source1: http://www.erlang.org/download/otp_doc_html_%{ver}-%{rel}.tar.gz
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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -48,6 +49,7 @@ Documentation for Erlang.
%setup -q -n otp_src_%{ver}-%{rel}
%patch0 -p1 -b .links
%patch1 -p1 -b .install
%patch2 -p1 -b .rpath
%patch3 -p1 -b .sslrpath
# enable dynamic linking for ssl
@ -117,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Sat Oct 25 2008 Gerard Milmeister <gemi@bluewin.ch> - R12B-4.1
- new release R12B-4
* Fri Sep 5 2008 Gerard Milmeister <gemi@bluewin.ch> - R12B-3.3%{?dist}
- fixed sslrpath patch

25
otp-rpath.patch
View File

@ -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

9
otp-sslrpath.patch
View File

@ -1,8 +1,7 @@
diff -up otp_src_R12B-3/lib/ssl/c_src/Makefile.in.sslrpath otp_src_R12B-3/lib/ssl/c_src/Makefile.in
--- otp_src_R12B-3/lib/ssl/c_src/Makefile.in.sslrpath 2008-09-05 22:01:58.000000000 +0200
+++ otp_src_R12B-3/lib/ssl/c_src/Makefile.in 2008-09-05 22:02:34.000000000 +0200
@@ -102,7 +102,7 @@ else
SSL_MAKEFILE =
--- 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
endif
-CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@

6
sources
View File

@ -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
ae81edda4a17506af7a9d73abca033b2 otp_src_R12B-4.tar.gz
f633cd418d8260af7a11c998aa88072b otp_doc_html_R12B-4.tar.gz
ef8f96d1721a2345cc87b208cde3de06 otp_doc_man_R12B-4.tar.gz