Merge pull request jl777#268 from VerusCoin/dev

Dev

Author: Asherda

.gitlab-ci.yml

@@ -68,13 +68,15 @@ build:linux:
       - ${VERUS_CLI_LINUX}.sha256
     expire_in: 1 week
 
-build:linux:arm64:
+.build:linux:arm64:
   image: asherd/verus-builders:cross-arm
   variables:
     DOCKER_DRIVER: overlay2
     HOST: aarch64-linux-gnu
     STRIP: /usr/aarch64-linux-gnu/bin/strip
     STATIC_LIBCURL: 1
+    CXX: g++-8-aarch64-linux-gnu
+    CC: gcc-8-aarch64-linux-gnu
   stage: build
   cache:
     key: "${CI_JOB_NAME}${CI_COMMIT_REF_NAME}"
@@ -356,11 +358,11 @@ deploy:
     - build:linux
     - build:windows
     - build:mac
-    - build:linux:arm64
+ #   - build:linux:arm64
   script:
     - mkdir Windows && mkdir Linux && mkdir MacOS &&
       cp ${VERUS_CLI_WINDOWS} Windows &&
-      cp ${VERUS_CLI_LINUX} ${VERUS_CLI_ARM64_LINUX} Linux &&
+      cp ${VERUS_CLI_LINUX} Linux &&
       cp ${VERUS_CLI_MACOS} MacOS
     - echo "$AUTH_KEY" > AUTH_KEY.json &&
       gcloud auth activate-service-account
@@ -383,8 +385,8 @@ deploy:
       - ${VERUS_CLI_WINDOWS}.sha256
       - ${VERUS_CLI_MACOS}
       - ${VERUS_CLI_MACOS}.sha256
-      - ${VERUS_CLI_ARM64_LINUX}
-      - ${VERUS_CLI_ARM64_LINUX}.sha256
+   #   - ${VERUS_CLI_ARM64_LINUX}
+   #   - ${VERUS_CLI_ARM64_LINUX}.sha256
     expire_in: 1 week
 ########################################################################################################################
 ####END####                                           Deploy                                                 ####END####

src/Makefile.am

@@ -485,7 +485,7 @@ if ARCH_ARM
 crypto_libverus_portable_crypto_a_CPPFLAGS = -O3 -Wint-conversion -g -march=armv8.1-a+crypto -flax-vector-conversions -funroll-loops -fomit-frame-pointer -fPIC $(AM_CPPFLAGS)
 crypto_libverus_portable_crypto_a_CXXFLAGS = -O3 -Wint-conversion -g -march=armv8.1-a+crypto -flax-vector-conversions -funroll-loops -fomit-frame-pointer -fPIC $(AM_CXXFLAGS)
 else
-crypto_libverus_portable_crypto_a_CPPFLAGS = -O3 -Wint-conversion -march=x86-64 -g -funroll-loops -fomit-frame-pointer -fPIC $(AM_CPPFLAGS)
+crypto_libverus_portable_crypto_a_CPPFLAGS = -O3 -Wint-conversion -march=x86-64 -g -funroll-loops -fomit-frame-pointer -fPIC $(AM_CPPFLAGS) -w
 crypto_libverus_portable_crypto_a_CXXFLAGS = -O3 -Wint-conversion -march=x86-64 -g -funroll-loops -fomit-frame-pointer -fPIC $(AM_CXXFLAGS)
 endif
 
@@ -761,7 +761,7 @@ endif
 
 libzcashconsensus_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(RELDFLAGS)
 libzcashconsensus_la_LIBADD = $(LIBSECP256K1)
-libzcashconsensus_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/obj -I$(srcdir)/secp256k1/include -I$(srcdir)/cryptoconditions/include -DBUILD_BITCOIN_INTERNAL
+libzcashconsensus_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/obj -I$(srcdir)/secp256k1/include -I$(srcdir)/cryptoconditions/include -DBUILD_BITCOIN_INTERNAL -w
 libzcashconsensus_la_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 
 endif

src/cryptoconditions/src/asn/asn_system.h

@@ -13,8 +13,8 @@
 #include "cryptoconditions-config.h"
 #endif
 
-#ifndef _BSD_SOURCE
-#define _BSD_SOURCE /* for snprintf() on some linux systems  */
+#ifndef _DEFAULT_SOURCE
+#define _DEFAULT_SOURCE /* for snprintf() on some linux systems  */
 #endif
 
 #include <stdio.h>	/* For snprintf(3) */

src/cryptoconditions/src/threshold.c

@@ -234,7 +234,7 @@ static Fulfillment_t *thresholdToPartialFulfillment(const CC *cond) {
     int maxSubThresholds = 1;   // maximum required in all nested thresholds, if it is 1, we know that one signature only is required, and we can optimize since waiting for another sig is unnecessary
     CCVisitor subThresholdVisitor = {&maxThreshholdCountVisit, "", 0, &maxSubThresholds};
     thresholdVisitChildren(cond, subThresholdVisitor);
-    int evalCount = cc_countEvals(cond);
+  //  int evalCount = cc_countEvals(cond);
     int canOptimize = 0;
 
     /*

src/deprecation.h

@@ -8,7 +8,7 @@
 // Deprecation policy:
 // * Shut down 20 weeks' worth of blocks after the estimated release block height.
 // * A warning is shown during the 2 weeks' worth of blocks prior to shut down.
-static const int APPROX_RELEASE_HEIGHT = 820300;
+static const int APPROX_RELEASE_HEIGHT = 821200;
 static const int WEEKS_UNTIL_DEPRECATION = 20;
 static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 60 * 24);
 

zcutil/build.sh

@@ -104,5 +104,5 @@ ld -v
 HOST="$HOST" BUILD="$BUILD" NO_PROTON="$PROTON_ARG" "$MAKE" "$@" -C ./depends/ V=1
 ./autogen.sh
 
-CONFIG_SITE="$PWD/depends/$HOST/share/config.site" ./configure "$HARDENING_ARG" "$LCOV_ARG" "$TEST_ARG" "$MINING_ARG" "$PROTON_ARG" $CONFIGURE_FLAGS CPPFLAGS='-g' CXXFLAGS='-g'
+CONFIG_SITE="$PWD/depends/$HOST/share/config.site" ./configure "$HARDENING_ARG" "$LCOV_ARG" "$TEST_ARG" "$MINING_ARG" "$PROTON_ARG" $CONFIGURE_FLAGS CPPFLAGS='-g -Wno-builtin-declaration-mismatch -Werror' CXXFLAGS='-g'
 "$MAKE" "$@" V=1