Revert "build: add symbol versioning when we build with gnu ld"

This reverts commit cb5492978b6b157f529806afb2f5fc6202888129.

For more information, please have a look at the discussion on
samba-technical starting with [1].

[1] http://lists.samba.org/archive/samba-technical/2008-June/059511.html

Karolin
(cherry picked from commit 1e5aeb96f92fef8056ec9010e125f4d0d31dd90e)
(This used to be commit d06baf0e744d779b836783f61ec97d3a6d380eb5)

6 files changed, 16 insertions, 69 deletions

diff --git a/source3/Makefile.in b/source3/Makefile.in
index eafa7cc0ae..7651cb2af5 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1604,8 +1604,8 @@ bin/ldbdel: $(BINARY_PREREQS) $(LDBDEL_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIB
 
 MKSYMS_SH = $(srcdir)/script/mksyms.sh
 
-$(LIBTALLOC_SYMS): $(LIBTALLOC_HEADERS) $(builddir)/library-versions
-	@$(MKSYMS_SH) $(AWK) $(builddir)/library-versions $@ $(LIBTALLOC_HEADERS)
+$(LIBTALLOC_SYMS): $(LIBTALLOC_HEADERS)
+	@$(MKSYMS_SH) $(AWK) $@ $(LIBTALLOC_HEADERS)
 
 $(LIBTALLOC_SHARED_TARGET): $(BINARY_PREREQS) $(LIBTALLOC_OBJ) $(LIBTALLOC_SYMS)
 	@echo Linking shared library $@
@@ -1617,8 +1617,8 @@ $(LIBTALLOC_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTALLOC_OBJ0)
 	@echo Linking non-shared library $@
 	@-$(AR) -rc $@ $(LIBTALLOC_OBJ0)
 
-$(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 $@
@@ -1630,8 +1630,8 @@ $(LIBTDB_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTDB_OBJ0)
 	@echo Linking non-shared library $@
 	@-$(AR) -rc $@ $(LIBTDB_OBJ0)
 
-$(LIBWBCLIENT_SYMS): $(LIBWBCLIENT_HEADERS) $(builddir)/library-versions
-	@$(MKSYMS_SH) $(AWK) $(builddir)/library-versions $@ $(LIBWBCLIENT_HEADERS)
+$(LIBWBCLIENT_SYMS): $(LIBWBCLIENT_HEADERS)
+	@$(MKSYMS_SH) $(AWK) $@ $(LIBWBCLIENT_HEADERS)
 
 $(LIBWBCLIENT_SHARED_TARGET): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ) $(LIBWBCLIENT_SYMS) @LIBTALLOC_SHARED@
 	@echo Linking shared library $@
@@ -1653,8 +1653,8 @@ 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_SYMS): $(LIBNETAPI_HEADERS)
+	@$(MKSYMS_SH) $(AWK) $@ $(LIBNETAPI_HEADERS)
 
 $(LIBNETAPI_SHARED_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ) $(LIBNETAPI_SYMS) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
 	@echo Linking shared library $@
diff --git a/source3/configure.in b/source3/configure.in
index e25c213d03..8d837eee6f 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1520,23 +1520,6 @@ fi
 # Set defaults
 SYMSEXT="syms"
 AC_SUBST(SYMSEXT)
-use_symbol_versioning=no
-if test x"$ac_cv_gnu_ld_version_script" = x"yes"; then
-	use_symbol_versioning=yes
-fi
-AC_ARG_ENABLE(symbol-versioning,[
-	AS_HELP_STRING([--enable-symbol-versioning],
-		[Turn on symbol versioning support if available (default=auto)])
-])
-if test x"$enable_symbol_versioning" = x"no"; then
-	use_symbol_versioning=no
-fi
-
-AC_MSG_CHECKING([symbol versioning])
-if test "x$use_symbol_versioning" = x"yes"; then
-	SYMSEXT="version.syms"
-fi
-AC_MSG_RESULT($use_symbol_versioning)
 
 # Assume non-shared by default and override below
 BLDSHARED="false"
diff --git a/source3/exports/libsmbclient.version.syms b/source3/exports/libsmbclient.version.syms
deleted file mode 100644
index 6afdbcbadf..0000000000
--- a/source3/exports/libsmbclient.version.syms
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# we use no version symbols for libsmbclient
-# to be compatible with 3.0.x
-#
-{
-	global: smbc_*;
-	local: *;
-};
diff --git a/source3/exports/libsmbsharemodes.version.syms b/source3/exports/libsmbsharemodes.version.syms
deleted file mode 100644
index cf3f0336e9..0000000000
--- a/source3/exports/libsmbsharemodes.version.syms
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# we use no version symbols for libsmbsharemodes
-# to be compatible with 3.0.x
-#
-{
-	global: *;
-};
diff --git a/source3/script/mksyms.awk b/source3/script/mksyms.awk
index dfe51dba7f..a30bea4d34 100644
--- a/source3/script/mksyms.awk
+++ b/source3/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/source3/script/mksyms.sh b/source3/script/mksyms.sh
index 673c77a3cf..51d3fbd999 100755
--- a/source3/script/mksyms.sh
+++ b/source3/script/mksyms.sh
@@ -15,50 +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}"
-
-symsext=`basename $symsfile | cut -d '.' -f2-`
-
-if test x"$symsext" = x"version.syms"; then
-	echo "creating $symsfile for $symver"
-else
-	echo "creating $symsfile"
-	symver="# no symbol versioning"
-fi
-
 proto_src="`echo $@ | tr ' ' '\n' | sort | uniq `"
 
-mkdir -p `dirname $symsfile`
+echo creating $symsfile
 
-cat > $symsfile_tmp <<_ACEOF
-#
-# This file is automatically generated with "$0". DO NOT EDIT
-#
-$symver
-_ACEOF
+mkdir -p `dirname $symsfile`
 
-${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