~ubuntu-branches/ubuntu/trusty/erlang/trusty

« back to all changes in this revision

Viewing changes to debian/patches/rpath.patch

  • Committer: Bazaar Package Importer
  • Author(s): Clint Byrum
  • Date: 2011-05-05 15:48:43 UTC
  • mfrom: (3.5.13 sid)
  • Revision ID: james.westby@ubuntu.com-20110505154843-0om6ekzg6m7ugj27
Tags: 1:14.b.2-dfsg-3ubuntu1
* Merge from debian unstable.  Remaining changes:
  - Drop libwxgtk2.8-dev build dependency. Wx isn't in main, and not
    supposed to.
  - Drop erlang-wx binary.
  - Drop erlang-wx dependency from -megaco, -common-test, and -reltool, they
    do not really need wx. Also drop it from -debugger; the GUI needs wx,
    but it apparently has CLI bits as well, and is also needed by -megaco,
    so let's keep the package for now.
  - debian/patches/series: Do what I meant, and enable build-options.patch
    instead.
* Additional changes:
  - Drop erlang-wx from -et
* Dropped Changes:
  - patches/pcre-crash.patch: CVE-2008-2371: outer level option with
    alternatives caused crash. (Applied Upstream)
  - fix for ssl certificate verification in newSSL: 
    ssl_cacertfile_fix.patch (Applied Upstream)
  - debian/patches/series: Enable native.patch again, to get stripped beam
    files and reduce the package size again. (build-options is what
    actually accomplished this)
  - Remove build-options.patch on advice from upstream and because it caused
    odd build failures.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
Author: Sergei Golovan <sgolovan@debian.org>
 
2
Description: A quick hack which removes rpath from crypto and ssl applications binaries to
 
3
 satisfy Debian policy.
 
4
Forwarded: no
 
5
Last-modified:Sat, 27 Feb 2010 09:34:43 +0300
 
6
 
 
7
--- erlang-14.b.2-dfsg.orig/erts/configure.in
 
8
+++ erlang-14.b.2-dfsg/erts/configure.in
 
9
@@ -3962,9 +3962,9 @@
 
10
 SSL_CC_RUNTIME_LIBRARY_PATH=
 
11
 SSL_LD_RUNTIME_LIBRARY_PATH=
 
12
 SSL_DED_LD_RUNTIME_LIBRARY_PATH=
 
13
-cc_rflg="$CFLAG_RUNTIME_LIBRARY_PATH"
 
14
-ld_rflg="$LDFLAG_RUNTIME_LIBRARY_PATH"
 
15
-ded_ld_rflg="$DED_LD_FLAG_RUNTIME_LIBRARY_PATH"
 
16
+cc_rflg=
 
17
+ld_rflg=
 
18
+ded_ld_rflg=
 
19
 
 
20
 if test "$SSL_APP" != "" && test "$SSL_DYNAMIC_ONLY" = "yes" && \
 
21
    { test "$cc_rflg" != "" || test "$ld_rflg" != "" || test "$ded_ld_rflg" != ""; } ; then