Revert "build: add symbol versioning to libtdb via script/mksyms.*"

This reverts commit 7b2f25dd78f8e67b2ac4b5cd333fb788669fd2d3.

metze

diff --git a/source/Makefile.in b/source/Makefile.in
index b71bb34de90acd44df25dc75ec7898d487e7c414..71b2018a5b2d5381deded366318180a43ae91a5c 100644 (file)
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -1576,7 +1576,7 @@ $(LIBTALLOC_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTALLOC_OBJ0)
 MKSYMS_SH = $(srcdir)/script/mksyms.sh
 
 $(LIBTDB_SYMS): $(LIBTDB_HEADERS)
-       @$(MKSYMS_SH) $(AWK) $(builddir)/library-versions $@ $(LIBTDB_HEADERS)
+       @$(MKSYMS_SH) $(AWK) $@ $(LIBTDB_HEADERS)
 
 $(LIBTDB_SHARED_TARGET): $(BINARY_PREREQS) $(LIBTDB_OBJ) $(LIBTDB_SYMS)
        @echo Linking shared library $@

diff --git a/source/script/mksyms.awk b/source/script/mksyms.awk
index dfe51dba7f0f93e8301e287d3491e70758b892ef..a30bea4d340ba7b8ad2d4e8d8c391a25be68d735 100644 (file)
--- 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 d2f3f3a134b0122e9447a0d259d3d75508525614..51d3fbd99925069bf9beead03f3a41c58881b2a6 100755 (executable)
--- 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