diff options
| author | Liguros - Gitlab CI/CD [master] <gitlab@liguros.net> | 2021-01-17 23:35:33 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [master] <gitlab@liguros.net> | 2021-01-17 23:35:33 +0000 |
| commit | 8e8120eabdd28020aa69c7a60505cce2edd20adc (patch) | |
| tree | 061bf0acdc672720e0bc3a2d575f67d25aedb2d8 /dev-libs/s2n | |
| parent | c16790af2c9b4cbc38e565d4311252193ff85484 (diff) | |
| download | baldeagleos-repo-21.1.2.tar.gz baldeagleos-repo-21.1.2.tar.xz baldeagleos-repo-21.1.2.zip | |
Updating liguros repo21.1.2
Diffstat (limited to 'dev-libs/s2n')
| -rw-r--r-- | dev-libs/s2n/files/s2n-0.10.21-remove_Werror.patch | 22 | ||||
| -rw-r--r-- | dev-libs/s2n/s2n-0.10.21-r1.ebuild (renamed from dev-libs/s2n/s2n-0.10.21.ebuild) | 15 |
2 files changed, 35 insertions, 2 deletions
diff --git a/dev-libs/s2n/files/s2n-0.10.21-remove_Werror.patch b/dev-libs/s2n/files/s2n-0.10.21-remove_Werror.patch new file mode 100644 index 000000000000..d0eadc7a8bd3 --- /dev/null +++ b/dev-libs/s2n/files/s2n-0.10.21-remove_Werror.patch @@ -0,0 +1,22 @@ +--- a/CMakeLists.txt 2020-12-14 17:24:27.577239622 +0100 ++++ b/CMakeLists.txt 2020-12-14 17:24:50.036240917 +0100 +@@ -193,7 +193,7 @@ + + set(CMAKE_C_FLAGS_DEBUGOPT "") + +-target_compile_options(${PROJECT_NAME} PRIVATE -pedantic -std=gnu99 -Wall -Werror -Wimplicit -Wunused -Wcomment -Wchar-subscripts ++target_compile_options(${PROJECT_NAME} PRIVATE -pedantic -std=gnu99 -Wall -Wimplicit -Wunused -Wcomment -Wchar-subscripts + -Wuninitialized -Wshadow -Wcast-qual -Wcast-align -Wwrite-strings -Wno-deprecated-declarations -Wno-unknown-pragmas -Wformat-security + -Wno-missing-braces -fvisibility=hidden -DS2N_EXPORTS) + +--- a/s2n.mk 2020-12-14 17:24:35.546240082 +0100 ++++ b/s2n.mk 2020-12-14 17:25:05.604241814 +0100 +@@ -42,7 +42,7 @@ + DEFAULT_CFLAGS = -std=c99 -Wcast-qual + endif + +-DEFAULT_CFLAGS += -pedantic -Wall -Werror -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized \ ++DEFAULT_CFLAGS += -pedantic -Wall -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized \ + -Wshadow -Wcast-align -Wwrite-strings -fPIC -Wno-missing-braces\ + -D_POSIX_C_SOURCE=200809L -O2 -I$(LIBCRYPTO_ROOT)/include/ \ + -I$(S2N_ROOT)/api/ -I$(S2N_ROOT) -Wno-deprecated-declarations -Wno-unknown-pragmas -Wformat-security \ diff --git a/dev-libs/s2n/s2n-0.10.21.ebuild b/dev-libs/s2n/s2n-0.10.21-r1.ebuild index 225dc5144615..270991d36e4d 100644 --- a/dev-libs/s2n/s2n-0.10.21.ebuild +++ b/dev-libs/s2n/s2n-0.10.21-r1.ebuild @@ -22,8 +22,12 @@ RDEPEND=" " DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}"/${P}-remove_Werror.patch +) + src_prepare() { - default + cmake_src_prepare # Fix # QA Notice: The following files contain writable and executable sections (...) @@ -31,7 +35,14 @@ src_prepare() { -e '$a\\n#if defined(__linux__) && defined(__ELF__)\n.section .note.GNU-stack,"",%progbits\n#endif' \ -i "${S}"/pq-crypto/sike_r2/fp_x64_asm.S || die "sed failed" - cmake_src_prepare + # Fix shared library building, needed for USE="test" + # See: https://github.com/awslabs/s2n/issues/2401 + if use test; then + sed -i -e 's, -fvisibility=hidden,,' "${S}"/CMakeLists.txt || die "sed failed" + # Remove s2n_self_talk_nonblocking_test, it is broken. + # See: https://github.com/awslabs/s2n/issues/2051#issuecomment-744543724 + rm "${S}"/tests/unit/s2n_self_talk_nonblocking_test.c + fi } src_configure() { |