Attachment 304522 Details for Bug 253872 – Upstream workaround to disable RPATH on x86_64

[patch] Upstream workaround to disable RPATH on x86_64

emacs-disable-rpatch.patch (text/plain), 1.79 KB, created by Brad Walker on 2008-05-05 11:39:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brad Walker

Created: 2008-05-05 11:39:38 UTC

Size: 1.79 KB

patch

obsolete

>Index: configure.in
>===================================================================
>RCS file: /cvsroot/emacs/emacs/configure.in,v
>retrieving revision 1.524
>retrieving revision 1.525
>diff -u -d -u -d -r1.524 -r1.525
>--- configure.in	23 Apr 2008 05:55:32 -0000	1.524
>+++ configure.in	3 May 2008 18:59:31 -0000	1.525
>@@ -1339,6 +1339,16 @@
>   window_system=x11
> fi
> 
>+## Workaround for bug in autoconf <= 2.62.
>+## http://lists.gnu.org/archive/html/emacs-devel/2008-04/msg01551.html
>+## No need to do anything special for these standard directories.
>+## This is an experiment, take it out if it causes problems.
>+if test -n "${x_libraries}" && test x"${x_libraries}" != xNONE; then
>+   
>+   x_libraries=`echo :${x_libraries}: | sed -e 's|:/usr/lib64:|:|g' -e 's|:/lib64:|:|g' -e 's|^:||' -e 's|:$||'`
>+
>+fi
>+
> if test "${x_libraries}" != NONE; then
>   if test -n "${x_libraries}"; then
>     LD_SWITCH_X_SITE=-L`echo ${x_libraries} | sed -e "s/:/ -L/g"`
>Index: configure
>===================================================================
>RCS file: /cvsroot/emacs/emacs/configure,v
>retrieving revision 1.263
>retrieving revision 1.264
>diff -u -d -u -d -r1.263 -r1.264
>--- configure	18 Apr 2008 15:48:03 -0000	1.263
>+++ configure	3 May 2008 19:01:26 -0000	1.264
>@@ -9289,6 +9289,15 @@
>   window_system=x11
> fi
> 
>+## Workaround for bug in autoconf <= 2.62.
>+## http://lists.gnu.org/archive/html/emacs-devel/2008-04/msg01551.html
>+## No need to do anything special for these standard directories.
>+if test -n "${x_libraries}" && test x"${x_libraries}" != xNONE; then
>+
>+   x_libraries=`echo :${x_libraries}: | sed -e 's|:/usr/lib64:|:|g' -e 's|:/lib64:|:|g' -e 's|^:||' -e 's|:$||'`
>+
>+fi
>+
> if test "${x_libraries}" != NONE; then
>   if test -n "${x_libraries}"; then
>     LD_SWITCH_X_SITE=-L`echo ${x_libraries} | sed -e "s/:/ -L/g"`

Actions: View | Diff

Attachments on bug 253872: 302963 | 304522