[SCM] Samba Shared Repository - branch v3-5-test updated

Karolin Seeger kseeger at samba.org
Fri Oct 21 12:50:30 MDT 2011


The branch, v3-5-test has been updated
       via  53b551d s3:Makefile: make DSO_EXPORTS_CMD more portable (#8531)
      from  3906163 Add new contributing FAQ announcing acceptance of corporate (C).

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


- Log -----------------------------------------------------------------
commit 53b551d160a9e5b645aaa6582d7ffc82e5e52b59
Author: Björn Jacke <bj at sernet.de>
Date:   Thu Oct 20 21:39:38 2011 +0200

    s3:Makefile: make DSO_EXPORTS_CMD more portable (#8531)
    
    It sems like every not completely trivial sed expression should be tested with
    Solaris' sed.  Its regexp engine is way more limited than the one of GNU
    sed. Thanks to Michael Pelletier for finding this! This fixes bug #8531
    
    Autobuild-User: Björn Jacke <bj at sernet.de>
    Autobuild-Date: Thu Oct 20 23:15:05 CEST 2011 on sn-devel-104
    (cherry picked from commit 37be1df3d7534c2cc8e1e25614164c2178372b94)
    (cherry picked from commit 763ad499aa4423c5e68a75f20f2ba8ee967e5984)

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

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


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 425aa2b..d1a8780 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -28,7 +28,7 @@ SHLD=@SHLD@
 LIB_PATH_VAR=@LIB_PATH_VAR@
 
 ## Dynamic shared libraries build settings
-DSO_EXPORTS_CMD=-Wl,--version-script,$(srcdir)/exports/`basename $@ | sed 's/@SHLIBEXT@\(.[0-9]\{1,\}\)\{0,1\}$$/@SYMSEXT@/'`
+DSO_EXPORTS_CMD=-Wl,--version-script,$(srcdir)/exports/`basename $@ | sed 's:\. at SHLIBEXT@[\.0-9]*$$:. at SYMSEXT@:'`
 DSO_EXPORTS=@DSO_EXPORTS@
 SHLD_DSO = $(SHLD) $(LDSHFLAGS) $(DSO_EXPORTS) -o $@
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list