[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-129-g6850dc2

Michael Adam obnox at samba.org
Thu Mar 6 17:04:30 GMT 2008


The branch, v3-2-test has been updated
       via  6850dc242b010bdcef5e427e51be04201f55b7f3 (commit)
      from  c0bc09854f0cea03bc0cc6845244ff12ca7229b6 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 6850dc242b010bdcef5e427e51be04201f55b7f3
Author: Michael Adam <obnox at samba.org>
Date:   Thu Mar 6 17:49:07 2008 +0100

    Revert "Build: Add an rpath of $(LIBDIR) to binary targets."
    
    This reverts commit 3a0f781352f364ce625a35ffd78257b27d984c47.
    
    This needs more thought.
    
    Setting RPATH like this does not work on all supported
    platforms (Linux, Solaris and AIX seem to work, HP-UX,
    Tru64 and MacOS don't, MacOS doesn't even seem to have
    an rpath at all prior to 10.4).
    
    What is more, rpath also has some bad effects (when
    updating libraries, e.g.), so it should not be set
    unconditionally.
    
    I will come up with a confiugure mechanism to control this.
    
    For now, just use the LDFLAGS environment variable if
    you want to use an rpath.
    
    Sorry for any inconveniences.
    
    Michael

-----------------------------------------------------------------------

Summary of changes:
 source/Makefile.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/Makefile.in b/source/Makefile.in
index 9523b8c..7dfa312 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -42,8 +42,8 @@ CPPFLAGS=-DHAVE_CONFIG_H @CPPFLAGS@
 
 EXEEXT=@EXEEXT@
 AR=@AR@
-LDSHFLAGS=@LDSHFLAGS@ @LDFLAGS@ -Wl,-R,$(LIBDIR)
-LDFLAGS=@PIE_LDFLAGS@ @LDFLAGS@ -Wl,-R,$(LIBDIR)
+LDSHFLAGS=@LDSHFLAGS@ @LDFLAGS@
+LDFLAGS=@PIE_LDFLAGS@ @LDFLAGS@
 
 WINBIND_NSS_LDSHFLAGS=@WINBIND_NSS_LDSHFLAGS@ @LDFLAGS@
 AWK=@AWK@


-- 
Samba Shared Repository


More information about the samba-cvs mailing list