diff options
| author | James Peach <jpeach@samba.org> | 2007-09-29 23:54:32 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:31:05 -0500 |
| commit | f3cf737ff0412ef8faf40a02e8e99c8ce8a271ff (patch) | |
| tree | 60b4afa10cebf470ebcf81d072d8df1d694de165 | |
| parent | 96c4510c8d2c9125e2b1c934b54a9dafb2c423a1 (diff) | |
| download | samba-f3cf737ff0412ef8faf40a02e8e99c8ce8a271ff.tar.gz samba-f3cf737ff0412ef8faf40a02e8e99c8ce8a271ff.tar.bz2 samba-f3cf737ff0412ef8faf40a02e8e99c8ce8a271ff.zip | |
r25432: Merge module linking changes from SAMBA_3_2 to SAMBA_3_2_0 to reduce
spurious tree differences.
(This used to be commit ee1eba2855c7ee2d60ba7d354e6731da78cbd48e)
| -rw-r--r-- | source3/Makefile.in | 11 | ||||
| -rw-r--r-- | source3/configure.in | 4 | ||||
| -rw-r--r-- | source3/exports/modules-darwin.syms (renamed from source3/modules/exports.darwin) | 0 |
3 files changed, 8 insertions, 7 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 4ab22abb0c..3713908373 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -6,6 +6,7 @@ # Copyright (C) 2003 Jim McDonough <jmcd@us.ibm.com> # Copyright (C) 2002-2003 Jelmer Vernooij <jelmer@samba.org> # Copyright (C) 2006 Lars Mueller <lars@samba.org> +# Copyright (C) 2007 James Peach <jpeach@samba.org> ########################################################################### prefix=@prefix@ @@ -27,6 +28,10 @@ DSO_EXPORTS=@DSO_EXPORTS@ SONAME_VER=`grep ^$@ $(builddir)/library-versions | cut -d: -f2` SHLD_DSO = $(SHLD) $(LDSHFLAGS) $(DSO_EXPORTS) -o $@ +# The MODULE_EXPORTS variable contains the platform-specific linker flags +# needed to restrict the exports for VFS, IDMAP, RPC and PASSDB modules. +MODULE_EXPORTS=@MODULE_EXPORTS@ + # Add $(DEVELOPER_CFLAGS) to $(CFLAGS) to enable extra compiler # (GCC) warnings. This is done automtically for --enable-developer # and --enable-krb5developer. @@ -39,10 +44,6 @@ AR=@AR@ LDSHFLAGS=@LDSHFLAGS@ @LDFLAGS@ LDFLAGS=@PIE_LDFLAGS@ @LDFLAGS@ -# The MODULE_EXPORTS variable conatins the platform-specific linker flags -# needed to restrict the exports for VFS, IDMAP, RPC and PASSDB modules. -MODULE_EXPORTS=@MODULE_EXPORTS@ - WINBIND_NSS_LDSHFLAGS=@WINBIND_NSS_LDSHFLAGS@ @LDFLAGS@ AWK=@AWK@ PICFLAG=@PICFLAG@ @@ -1433,7 +1434,7 @@ bin/librpc_unixinfo.@SHLIBEXT@: $(BINARY_PREREQS) $(RPC_UNIXINFO_OBJ) bin/librpc_epmapper.@SHLIBEXT@: $(BINARY_PREREQS) $(RPC_EPMAPPER_OBJ) @echo "Linking $@" - @$(SHLD_MODULE) $(RPC_SVC_OBJ) + @$(SHLD_MODULE) $(RPC_EPMAPPER_OBJ) bin/librpc_srvsvc.@SHLIBEXT@: $(BINARY_PREREQS) $(RPC_SVC_OBJ) @echo "Linking $@" diff --git a/source3/configure.in b/source3/configure.in index d546e265a7..2e1b7c7446 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -280,9 +280,9 @@ dnl Unique-to-Samba variables we'll be playing with. AC_SUBST(SAMBA_CPPFLAGS) AC_SUBST(SHELL) AC_SUBST(LDSHFLAGS) -AC_SUBST(MODULE_EXPORTS) AC_SUBST(SONAMEFLAG) AC_SUBST(SHLD) +AC_SUBST(MODULE_EXPORTS) AC_SUBST(DSO_EXPORTS) AC_SUBST(HOST_OS) AC_SUBST(PICFLAG) @@ -2029,7 +2029,7 @@ case "$host_os" in *darwin*) AC_DEFINE(DARWINOS,1,[Whether the host os is Darwin/MacOSX]) BLDSHARED="true" LDSHFLAGS="-bundle -flat_namespace -undefined suppress" - MODULE_EXPORTS="-exported_symbols_list \$(srcdir)/modules/exports.darwin" + MODULE_EXPORTS="-exported_symbols_list \$(srcdir)/exports/modules-darwin.syms" SHLIBEXT="dylib" # Since gcc doesn't fail on unrecognised options, the # PIE test incorrectly succeeds. Darwin gcc does not diff --git a/source3/modules/exports.darwin b/source3/exports/modules-darwin.syms index 5999025534..5999025534 100644 --- a/source3/modules/exports.darwin +++ b/source3/exports/modules-darwin.syms |