From eef9532c6e41007824775ab959e7a7f1d8ac12a2 Mon Sep 17 00:00:00 2001 From: kozyilmaz Date: Mon, 6 Aug 2018 11:27:49 +0300 Subject: [PATCH] sync with latest Zcash master branch --- zcash/Makefile | 2 +- zcash/patches/018-zcash-macos-wl-pie.patch | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 zcash/patches/018-zcash-macos-wl-pie.patch diff --git a/zcash/Makefile b/zcash/Makefile index 4250879..868c79f 100644 --- a/zcash/Makefile +++ b/zcash/Makefile @@ -9,7 +9,7 @@ zcash_clone: if [ ! -d "zcash_$(ZCASH_VERSION)" ]; then git clone -b $(ZCASH_VERSION) https://github.com/zcash/zcash.git zcash_$(ZCASH_VERSION); fi zcash_config: - $(call patchme,zcash_$(ZCASH_VERSION)) + @true zcash_build: ( cd zcash_$(ZCASH_VERSION); \ diff --git a/zcash/patches/018-zcash-macos-wl-pie.patch b/zcash/patches/018-zcash-macos-wl-pie.patch deleted file mode 100644 index 6a71e84..0000000 --- a/zcash/patches/018-zcash-macos-wl-pie.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 8e215d4b6..26981d664 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -495,7 +495,11 @@ if test x$use_hardening != xno; then - if test x$TARGET_OS != xwindows; then - # All windows code is PIC, forcing it on just adds useless compile warnings - AX_CHECK_COMPILE_FLAG([-fPIE],[PIE_FLAGS="-fPIE"],[AC_MSG_ERROR(Cannot enable -fPIE)]) -- AX_CHECK_LINK_FLAG([[-pie]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -pie"],[AC_MSG_ERROR(Cannot enable -pie)]) -+ if test x$BUILD_OS = xdarwin; then -+ AX_CHECK_LINK_FLAG([[-Wl,-pie]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-pie"],[AC_MSG_ERROR(Cannot enable -Wl,-pie)]) -+ else -+ AX_CHECK_LINK_FLAG([[-pie]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -pie"],[AC_MSG_ERROR(Cannot enable -pie)]) -+ fi - else - # These are only available on Windows. - AX_CHECK_LINK_FLAG([[-Wl,--dynamicbase]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,--dynamicbase"],[AC_MSG_ERROR(Cannot enable --dynamicbase)])