diff options
| author | Gérard Milmeister <gemi@fedoraproject.org> | 2008-10-25 22:01:51 +0000 |
|---|---|---|
| committer | Gérard Milmeister <gemi@fedoraproject.org> | 2008-10-25 22:01:51 +0000 |
| commit | c2fb77092e86e7d45e84389c9d7c676aad7df5ec (patch) | |
| tree | 2ab81c5e90001b1388583222e7d46a743334482d | |
| parent | e1055a8363bc0378eb84608a1d39661656d69868 (diff) | |
| download | erlang-c2fb77092e86e7d45e84389c9d7c676aad7df5ec.tar.gz erlang-c2fb77092e86e7d45e84389c9d7c676aad7df5ec.tar.xz erlang-c2fb77092e86e7d45e84389c9d7c676aad7df5ec.zip | |
*** empty log message ***
| -rw-r--r-- | erlang.spec | 2 | ||||
| -rw-r--r-- | otp-sslrpath.patch | 21 |
2 files changed, 18 insertions, 5 deletions
diff --git a/erlang.spec b/erlang.spec index 3d655e1..eafcdf4 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.1%{?dist} +Release: %{rel}.2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages diff --git a/otp-sslrpath.patch b/otp-sslrpath.patch index 83ba120..d53909a 100644 --- a/otp-sslrpath.patch +++ b/otp-sslrpath.patch @@ -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 |