Changes required for GLIBC backward compatibility with gitian builds (#501)

* Removed unused JAR

* Disabled libidn2 for back compat reasons

* Updated MAX versions for GLIBC in check symbols

* Upstream changes for compat code

* Added more back compat code to glibc_compat.cpp

* Added new wrapper for glob64 on i386/i686 builds

* riscv support for depends (Upstream changes)

* Enabled riscv64 for gitian builds

* arm 32bit was also using glob64 IDKW

* Added --with-pic for curl builds

* Updated Secp256k1 from upstream

* Removed a zip file in src

* Added -fPIC in gitian descriptor for riscv build

Author: mxaddict

configure.ac

@@ -515,6 +515,13 @@ if test x$use_glibc_compat != xno; then
   AC_DEFINE_UNQUOTED(FDELT_TYPE, $fdelt_type,[parameter and return value type for __fdelt_chk])
   AX_CHECK_LINK_FLAG([[-Wl,--wrap=__divmoddi4]], [COMPAT_LDFLAGS="$COMPAT_LDFLAGS -Wl,--wrap=__divmoddi4"])
   AX_CHECK_LINK_FLAG([[-Wl,--wrap=log2f]], [COMPAT_LDFLAGS="$COMPAT_LDFLAGS -Wl,--wrap=log2f"])
+  AX_CHECK_LINK_FLAG([[-Wl,--wrap=glob]], [COMPAT_LDFLAGS="$COMPAT_LDFLAGS -Wl,--wrap=glob"])
+  case $host in
+    # Need to add glob64 for 32bit builds
+    i?86-* | arm*)
+      AX_CHECK_LINK_FLAG([[-Wl,--wrap=glob64]], [COMPAT_LDFLAGS="$COMPAT_LDFLAGS -Wl,--wrap=glob64"])
+    ;;
+  esac
 else
   AC_SEARCH_LIBS([clock_gettime],[rt])
 fi
@@ -835,8 +842,7 @@ else
 
   AC_CHECK_HEADER([openssl/ssl.h],, AC_MSG_ERROR(libssl headers missing),)
   AC_CHECK_LIB([ssl],         [main],SSL_LIBS=-lssl, AC_MSG_ERROR(libssl missing))
-  AC_CHECK_LIB([unbound],     [main],[UNBOUND_LIBS=-lunbound
-    have_unbound=yes], [AC_MSG_ERROR(libunbound missing)])
+  AC_CHECK_LIB([unbound],     [main],[UNBOUND_LIBS=-lunbound have_unbound=yes], [AC_MSG_ERROR(libunbound missing)])
   AC_CHECK_LIB([curl],        [main],CURL_LIBS=-lcurl, AC_MSG_ERROR(libcurl missing))
 
   if test x$build_navcoin_utils$build_navcoind$navcoin_enable_qt$use_tests != xnononono; then

contrib/devtools/symbol-check.py

@@ -39,7 +39,7 @@
 'GCC':       (4,4,0),
 'CXXABI':    (1,3,3),
 'GLIBCXX':   (3,4,13),
-'GLIBC':     (2,27),
+'GLIBC':     (2,11),
 }
 # See here for a description of _IO_stdin_used:
 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=634261#109
@@ -73,8 +73,8 @@
 'libdl.so.2' # programming interface to dynamic linker
 }
 ARCH_MIN_GLIBC_VER = {
-'80386':  (2,27),
-'X86-64': (2,27),
+'80386':  (2,1),
+'X86-64': (2,2,5),
 'ARM':    (2,4),
 'AArch64':(2,17),
 'RISC-V': (2,27)

contrib/gitian-descriptors/gitian-linux.yml

@@ -16,10 +16,10 @@ packages:
 - "g++-8-arm-linux-gnueabihf"
 - "gcc-8-arm-linux-gnueabihf"
 - "binutils-arm-linux-gnueabihf"
-# - "g++-riscv64-linux-gnu"
-# - "g++-8-riscv64-linux-gnu"
-# - "gcc-8-riscv64-linux-gnu"
-# - "binutils-riscv64-linux-gnu"
+- "g++-riscv64-linux-gnu"
+- "g++-8-riscv64-linux-gnu"
+- "gcc-8-riscv64-linux-gnu"
+- "binutils-riscv64-linux-gnu"
 - "g++-8-multilib"
 - "gcc-8-multilib"
 - "binutils-gold"
@@ -40,12 +40,11 @@ script: |
   set -e -o pipefail
 
   WRAP_DIR=$HOME/wrapped
-  # HOSTS="i686-pc-linux-gnu x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu"
-  HOSTS="i686-pc-linux-gnu x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu"
+  HOSTS="i686-pc-linux-gnu x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu"
   CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-bench --disable-gui-tests"
   FAKETIME_HOST_PROGS="gcc g++"
   FAKETIME_PROGS="date ar ranlib nm"
-  HOST_CFLAGS="-O2 -g"
+  HOST_CFLAGS="-O2 -g -fPIC"
   HOST_CXXFLAGS="-O2 -g"
   HOST_LDFLAGS=-static-libstdc++
 

depends/.gitignore

@@ -8,3 +8,5 @@ i686*
 mips*
 arm*
 aarch64*
+riscv32*
+riscv64*

depends/hosts/default.mk

@@ -1,3 +1,7 @@
+ifneq ($(host),$(build))
+host_toolchain:=$(host)-
+endif
+
 default_host_CC = $(host_toolchain)gcc
 default_host_CXX = $(host_toolchain)g++
 default_host_AR = $(host_toolchain)ar

depends/packages/curl.mk

@@ -12,7 +12,7 @@ endef
 
 define $(package)_set_vars
   $(package)_config_env=CURL_CFLAG_EXTRAS="-DBUILDING_LIBCURL"
-  $(package)_config_opts=--with-ssl=$(host_prefix) --enable-static --disable-shared
+  $(package)_config_opts=--with-ssl=$(host_prefix) --enable-static --disable-shared --without-libidn2 --with-pic
   $(package)_config_opts_mingw32=--with-random=/dev/urandom
   $(package)_config_opts_x86_64_mingw32=--target=x86_64-w64-mingw32
   $(package)_config_opts_i686_mingw32=--target=i686-w64-mingw32

depends/packages/native_comparisontool.mk

@@ -1,5 +1,4 @@
 packages:=boost openssl libevent zeromq curl unbound expat
-native_packages := native_comparisontool
 
 qt_native_packages = native_protobuf
 qt_packages = qrencode protobuf zlib

depends/packages/packages.mk

@@ -11,6 +11,11 @@ define $(package)_set_vars
   $(package)_config_opts_linux=--with-pic
 endef
 
+define $(package)_preprocess_cmds
+   cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub . &&\
+   cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub gtest/build-aux
+endef
+
 define $(package)_config_cmds
   $($(package)_autoconf)
 endef

depends/packages/protobuf.mk

@@ -1,14 +1,18 @@
 package=qrencode
 $(package)_version=3.4.4
 $(package)_download_path=https://fukuchi.org/works/qrencode/
-$(package)_file_name=qrencode-$(qrencode_version).tar.bz2
+$(package)_file_name=$(package)-$($(package)_version).tar.bz2
 $(package)_sha256_hash=efe5188b1ddbcbf98763b819b146be6a90481aac30cfc8d858ab78a19cde1fa5
 
 define $(package)_set_vars
 $(package)_config_opts=--disable-shared -without-tools --disable-sdltest
 $(package)_config_opts_linux=--with-pic
 endef
 
+define $(package)_preprocess_cmds
+  cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub use
+endef
+
 define $(package)_config_cmds
   $($(package)_autoconf)
 endef