From 7fa0fe9f77ff4cdb0eb78927b09a1f77a672c1d6 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Mon, 31 Jan 2011 16:29:02 +0100 Subject: [PATCH] Remove rpaths from lib/ssl-*/bin/esock_ssl --- erlang.spec | 4 ++++ otp-0013-Remove-rpath-from-esock_ssl.patch | 27 ++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 otp-0013-Remove-rpath-from-esock_ssl.patch diff --git a/erlang.spec b/erlang.spec index d722627..362de7a 100644 --- a/erlang.spec +++ b/erlang.spec @@ -81,6 +81,9 @@ Patch11: otp-0011-Ugly-workaround-for-java-1.5.0-gcj-which-doesn-t-sup.patch # Fedora specific patch # Remove strange name field in efile_drv.c as it upsets -D_FORTIFY_SOURCE Patch12: otp-0012-Remove-strange-name-field-in-efile_drv.c-as-it-upset.patch +# Fedora specific patch +# Remove rpath from esock_ssl +Patch13: otp-0013-Remove-rpath-from-esock_ssl.patch # end of autogenerated patch tag list BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -982,6 +985,7 @@ Erlang mode for XEmacs (source lisp files). %endif %endif %patch12 -p1 -b .Remove_strange_name_field_in_efile_drv_c_as_it_upset +%patch13 -p1 -b .Remove_rpath_from_esock_ssl # end of autogenerated prep patch list # remove shipped zlib sources diff --git a/otp-0013-Remove-rpath-from-esock_ssl.patch b/otp-0013-Remove-rpath-from-esock_ssl.patch new file mode 100644 index 0000000..edc4004 --- /dev/null +++ b/otp-0013-Remove-rpath-from-esock_ssl.patch @@ -0,0 +1,27 @@ +From 1c4bfd0f25a12767a7530b59cd3ae7ab4a5803c1 Mon Sep 17 00:00:00 2001 +From: Hans Ulrich Niedermann +Date: Mon, 31 Jan 2011 13:33:28 +0100 +Subject: [PATCH] Remove rpath from esock_ssl + +Unset SSL_CC_RUNTIME_LIBRARY_PATH to build esock_ssl +without rpathes. +--- + lib/ssl/c_src/Makefile.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/lib/ssl/c_src/Makefile.in b/lib/ssl/c_src/Makefile.in +index bf4843b..90fb679 100644 +--- a/lib/ssl/c_src/Makefile.in ++++ b/lib/ssl/c_src/Makefile.in +@@ -128,7 +128,7 @@ else + CC_R_OPT = + endif + +-SSL_CC_RUNTIME_LIBRARY_PATH=@SSL_CC_RUNTIME_LIBRARY_PATH@ ++SSL_CC_RUNTIME_LIBRARY_PATH= + # Sigh... + ifeq ($(findstring @,$(SSL_CC_RUNTIME_LIBRARY_PATH)),@) + SSL_CC_RUNTIME_LIBRARY_PATH = $(CC_R_OPT) +-- +1.7.3.5 +