Skip to content

Commit 07518ff

Browse files
Merge #6891: depends: update 'src/dashbls' to dashpay/bls-signatures@dd683653 as e686744
b31fd98 build: stop tracking cmake dependency relic_conf.h.in (Kittywhiskers Van Gogh) e686744 Squashed 'src/dashbls/' changes from 0bb5c5b032..dd683653c6 (Kittywhiskers Van Gogh) b820266 revert: stop tracking cmake dependency relic_conf.h.in (Kittywhiskers Van Gogh) Pull request description: ## Additional Information * Dependency for #6889 * Expected subtree hash `bcd9c069752f3bf10e3812200ad990671dae230a34c2c0aa92e4c15032613743` (see [instructions](#6323 (review)) to calculate) ## Breaking Changes None expected. ## Checklist: - [x] I have performed a self-review of my own code **(note: N/A)** - [x] I have commented my code, particularly in hard-to-understand areas **(note: N/A)** - [x] I have added or updated relevant unit/integration/functional/e2e tests **(note: N/A)** - [x] I have made corresponding changes to the documentation **(note: N/A)** - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: UdjinM6: utACK b31fd98 PastaPastaPasta: utACK b31fd98 Tree-SHA512: d9aa0ede2b1e1851456d80153fd39476a0ff53eddba603227f2ab30606ba9f07dbae578860531ec2a706d13499ea82852e2ec3da3905f09d2f9fdc46cf96246f
2 parents 2350339 + b31fd98 commit 07518ff

File tree

5 files changed

+5
-11
lines changed

5 files changed

+5
-11
lines changed

src/dashbls/.github/workflows/build-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
os: [ macos-latest, ubuntu-20.04 ]
25+
os: [ macos-latest, ubuntu-latest ]
2626
builder: [ cmake, autotools ]
2727
compiler:
2828
- cc: gcc

src/dashbls/configure.ac

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
AC_PREREQ([2.60])
2-
AC_INIT([libdashbls],[1.3.5])
2+
AC_INIT([libdashbls],[1.3.6])
33
AC_CONFIG_AUX_DIR([build-aux])
44
AC_CONFIG_MACRO_DIR([build-aux/m4])
55

@@ -772,12 +772,6 @@ if test "$use_hardening" != "no"; then
772772
AX_CHECK_LINK_FLAG([-Wl,-z,now], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-z,now"], [], [])
773773
AX_CHECK_LINK_FLAG([-Wl,-z,separate-code], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-z,separate-code"], [], [])
774774
AX_CHECK_LINK_FLAG([-fPIE -pie], [HARDENED_FLAGS="$HARDENED_FLAGS -fPIE"; HARDENED_LDFLAGS="$HARDENED_LDFLAGS -pie"], [], [])
775-
776-
case $host in
777-
*mingw*)
778-
AC_CHECK_LIB([ssp], [main], [], [AC_MSG_ERROR([libssp missing])])
779-
;;
780-
esac
781775
fi
782776

783777
CORE_CPPFLAGS="$CORE_CPPFLAGS -DHAVE_BUILD_INFO"

src/dashbls/depends/mimalloc/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.0)
1+
cmake_minimum_required(VERSION 3.14)
22
project(libmimalloc C CXX)
33

44
set(CMAKE_C_STANDARD 11)

src/dashbls/depends/mimalloc/test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.0)
1+
cmake_minimum_required(VERSION 3.14)
22
project(mimalloc-test C CXX)
33

44
set(CMAKE_C_STANDARD 11)

src/dashbls/depends/relic/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.1)
1+
cmake_minimum_required(VERSION 3.14)
22
if(NOT ${CMAKE_VERSION} VERSION_LESS "3.1")
33
cmake_policy(SET CMP0054 NEW)
44
endif()

0 commit comments

Comments
 (0)