From a282099edbc8832e5aee6b5f2c6b49e289d9a1d0 Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Wed, 22 Feb 2023 15:34:53 -0500 Subject: [PATCH 1/2] fix(solidity) woo, my PR made it in! --- projects/soliditylang.org/package.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/projects/soliditylang.org/package.yml b/projects/soliditylang.org/package.yml index 1c5be90c92..5d987eac40 100644 --- a/projects/soliditylang.org/package.yml +++ b/projects/soliditylang.org/package.yml @@ -27,7 +27,7 @@ build: gnu.org/patch: '*' working-directory: build script: | - if semverator satisfies ^0.8.18 {{version}}; then + if semverator eq 0.8.18 {{version}}; then # New libsolidity/lsb/DocumentHoverHandler.cpp doesn't like some versions of clang # (default argument issue) # https://github.com/ethereum/solidity/issues/13854 @@ -49,6 +49,10 @@ build: - -DCMAKE_INSTALL_PREFIX={{prefix}} - -DPEDANTIC=OFF # otherwise fails due to deprecations in boost ^1.81 - -DSTRICT_Z3_VERSION=OFF # otherwise complains about Z3 version in cmake + linux/x86-64: + CFLAGS: "$CFLAGS -fPIC" + CXXFLAGS: "$CXXFLAGS -fPIC" + LDFLAGS: "$LDFLAGS -pie" test: solc --bin fixture.sol From 53fc44aad6d65cb8c175ae537818ddd5e2602b12 Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Sat, 4 Mar 2023 18:29:21 -0500 Subject: [PATCH 2/2] needs boost PICd --- projects/soliditylang.org/package.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/projects/soliditylang.org/package.yml b/projects/soliditylang.org/package.yml index 5d987eac40..12b192c795 100644 --- a/projects/soliditylang.org/package.yml +++ b/projects/soliditylang.org/package.yml @@ -49,10 +49,13 @@ build: - -DCMAKE_INSTALL_PREFIX={{prefix}} - -DPEDANTIC=OFF # otherwise fails due to deprecations in boost ^1.81 - -DSTRICT_Z3_VERSION=OFF # otherwise complains about Z3 version in cmake + - -DCMAKE_C_FLAGS=$CFLAGS + - -DCMAKE_CXX_FLAGS=$CXXFLAGS + - -DCMAKE_EXE_LINKER_FLAGS=$LDFLAGS linux/x86-64: - CFLAGS: "$CFLAGS -fPIC" - CXXFLAGS: "$CXXFLAGS -fPIC" - LDFLAGS: "$LDFLAGS -pie" + CFLAGS: -fPIC + CXXFLAGS: -fPIC + LDFLAGS: -pie test: solc --bin fixture.sol