The branch, v3-2-test has been updated via 759afa1832956f4c4da8cce1a1b79366e139041d (commit) via 3e4bde4af2ff7a14256a918b38aba97469e3b2d4 (commit) via 2a7b549517632b231718e16ccb869cfa88078237 (commit) via fbd31d42e327ccbe79f02df7b4e57646ef85df26 (commit) from edf73a97f674d4cb30f20b0cc3d6e6b43b4ca3eb (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log ----------------------------------------------------------------- commit 759afa1832956f4c4da8cce1a1b79366e139041d Author: Stefan Metzmacher <[EMAIL PROTECTED]> Date: Fri May 23 08:40:24 2008 +0200 Revert "build: add symbol versioning to libtalloc and libwbclient" This reverts commit ec4e8954402280c12c08cad0cb7cd9d3acb14152. metze commit 3e4bde4af2ff7a14256a918b38aba97469e3b2d4 Author: Stefan Metzmacher <[EMAIL PROTECTED]> Date: Fri May 23 08:40:09 2008 +0200 Revert "build: add symbol versioning to libtdb via script/mksyms.*" This reverts commit 7b2f25dd78f8e67b2ac4b5cd333fb788669fd2d3. metze commit 2a7b549517632b231718e16ccb869cfa88078237 Author: Stefan Metzmacher <[EMAIL PROTECTED]> Date: Fri May 23 08:39:54 2008 +0200 Revert "build: fix dependencies for the generated libtdb.syms file" This reverts commit 2e934c72d2f02abf3a1c54d1cfd9921be0f55903. metze commit fbd31d42e327ccbe79f02df7b4e57646ef85df26 Author: Stefan Metzmacher <[EMAIL PROTECTED]> Date: Fri May 23 08:39:22 2008 +0200 Revert "build: autogenerate exports/libnetapi.syms" This reverts commit 92b05ed38dce0780c6fbdc7b971240fb563e5890. metze ----------------------------------------------------------------------- Summary of changes: source/Makefile.in | 11 ++------ .../{libsmbsharemodes.syms => libnetapi.syms} | 0 source/exports/libtalloc.syms | 2 +- source/exports/libwbclient.syms | 2 +- source/script/mksyms.awk | 3 ++ source/script/mksyms.sh | 25 +++---------------- 6 files changed, 12 insertions(+), 31 deletions(-) copy source/exports/{libsmbsharemodes.syms => libnetapi.syms} (100%) Changeset truncated at 500 lines: diff --git a/source/Makefile.in b/source/Makefile.in index 6accd6f..71b2018 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -160,8 +160,6 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ LIBNETAPI=$(LIBNETAPI_STATIC_TARGET) @LIBNETAPI_SHARED@ -LIBNETAPI_SYMS=$(srcdir)/exports/libnetapi.syms -LIBNETAPI_HEADERS=$(srcdir)/lib/netapi/netapi.h FLAGS1 = $(CFLAGS) @FLAGS1@ @SAMBA_CPPFLAGS@ $(CPPFLAGS) FLAGS2 = @@ -1577,8 +1575,8 @@ $(LIBTALLOC_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTALLOC_OBJ0) MKSYMS_SH = $(srcdir)/script/mksyms.sh -$(LIBTDB_SYMS): $(LIBTDB_HEADERS) $(builddir)/library-versions - @$(MKSYMS_SH) $(AWK) $(builddir)/library-versions $@ $(LIBTDB_HEADERS) +$(LIBTDB_SYMS): $(LIBTDB_HEADERS) + @$(MKSYMS_SH) $(AWK) $@ $(LIBTDB_HEADERS) $(LIBTDB_SHARED_TARGET): $(BINARY_PREREQS) $(LIBTDB_OBJ) $(LIBTDB_SYMS) @echo Linking shared library $@ @@ -1610,10 +1608,7 @@ bin/libaddns.a: $(BINARY_PREREQS) $(LIBADDNS_OBJ) @echo Linking non-shared library $@ @-$(AR) -rc $@ $(LIBADDNS_OBJ) -$(LIBNETAPI_SYMS): $(LIBNETAPI_HEADERS) $(builddir)/library-versions - @$(MKSYMS_SH) $(AWK) $(builddir)/library-versions $@ $(LIBNETAPI_HEADERS) - -$(LIBNETAPI_SHARED_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ) $(LIBNETAPI_SYMS) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ +$(LIBNETAPI_SHARED_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @echo Linking shared library $@ @$(SHLD_DSO) $(LIBNETAPI_OBJ) \ @LIBTALLOC_LIBS@ @LIBTDB_LIBS@ @LIBWBCLIENT_SHARED@ $(LIBS) \ diff --git a/source/exports/libsmbsharemodes.syms b/source/exports/libnetapi.syms similarity index 100% copy from source/exports/libsmbsharemodes.syms copy to source/exports/libnetapi.syms diff --git a/source/exports/libtalloc.syms b/source/exports/libtalloc.syms index 9d77308..87f1c5c 100644 --- a/source/exports/libtalloc.syms +++ b/source/exports/libtalloc.syms @@ -1,4 +1,4 @@ -TALLOC_1_2 { +{ global: talloc_*; _talloc_*; diff --git a/source/exports/libwbclient.syms b/source/exports/libwbclient.syms index e1c3911..f1e68b4 100644 --- a/source/exports/libwbclient.syms +++ b/source/exports/libwbclient.syms @@ -1,4 +1,4 @@ -WBCLIENT_0_1 { +{ global: wbc*; local: *; }; diff --git a/source/script/mksyms.awk b/source/script/mksyms.awk index dfe51db..a30bea4 100644 --- a/source/script/mksyms.awk +++ b/source/script/mksyms.awk @@ -9,6 +9,9 @@ BEGIN { inheader=0; current_file=""; + print "#" + print "# This file is automatically generated with \"make symbols\". DO NOT EDIT " + print "#" print "{" print "\tglobal:" } diff --git a/source/script/mksyms.sh b/source/script/mksyms.sh index d2f3f3a..51d3fbd 100755 --- a/source/script/mksyms.sh +++ b/source/script/mksyms.sh @@ -15,43 +15,26 @@ LANG=C; export LANG LC_ALL=C; export LC_ALL LC_COLLATE=C; export LC_COLLATE -if [ $# -lt 3 ] +if [ $# -lt 2 ] then - echo "Usage: $0 awk versionfile output_file header_files" + echo "Usage: $0 awk output_file header_files" exit 1 fi awk="$1" shift -versionfile="$1" -shift - symsfile="$1" shift symsfile_tmp="$symsfile.$$.tmp~" -libname=`basename $symsfile | cut -d '.' -f1` -verline=`grep $libname $versionfile` -majver=`echo -n "$verline" | cut -d ':' -f2` -minver=`echo -n "$verline" | cut -d ':' -f3` -upname=`echo -n "$libname" | sed -e 's/^lib//' | tr '[a-z]' '[A-Z]'` -symver="${upname}_${majver}_${minver}" - proto_src="`echo $@ | tr ' ' '\n' | sort | uniq `" -echo "creating $symsfile for $symver" +echo creating $symsfile mkdir -p `dirname $symsfile` -cat > $symsfile_tmp <<_ACEOF -# -# This file is automatically generated with "$0". DO NOT EDIT -# -$symver -_ACEOF - -${awk} -f `dirname $0`/mksyms.awk $proto_src >> $symsfile_tmp +${awk} -f `dirname $0`/mksyms.awk $proto_src > $symsfile_tmp if cmp -s $symsfile $symsfile_tmp 2>/dev/null then -- Samba Shared Repository