mirror of
https://github.com/gentoo-mirror/guru.git
synced 2025-04-10 20:18:41 -04:00
dev-libs/lsquic: drop 4.0.8-r1
Closes: https://bugs.gentoo.org/910096 (obsolete) Closes: https://bugs.gentoo.org/910246 (obsolete) Closes: https://bugs.gentoo.org/932371 (obsolete) Signed-off-by: Takuya Wakazono <pastalian46@gmail.com>
This commit is contained in:
parent
96b7067ea4
commit
1058b7fa32
@ -1,4 +1,3 @@
|
||||
DIST boringssl-9fc1c.tar.gz 35071632 BLAKE2B b90468dcf260915189f614bf83717e34e7905e83086322b78ad19d77f7fe24f6c2f739c634f67de1ef09d5de23e966fc20e2214d9ef7843dbf32ede968d08f93 SHA512 cbc3ca154a6abe53e3c4f46bdd0205195d7120efced061558c05e8a8ae5ba5aee2b4c9eb5fe4c590d87ede11ff8f2e45b06e37595359a300447ed3dc9390f500
|
||||
DIST boringssl-fips-20230428.tar.gz 32288205 BLAKE2B 50588024cfd985b23be6f780197d092beae4b97bb2b5e01a6aca1477b0f5f0ffd0b6ac9558bd42fb5b4de4898a8987326afbe28422bb6dafbfc2104660958a83 SHA512 afdf94a4bbf4e92082ddcdb798c7b13e489f63ad50d9a79ee0f7222c0c830dd75a313cb8e3220816f1dc6872fe7493522938797c18c728e41a7c8f77bd597fc1
|
||||
DIST lsquic-4.0.12.tar.gz 1928464 BLAKE2B c60e752dbd59eaf22b4a993fb6a1917b8a59ae07ee5873f41248698af84fd1cff450e8b32bc038ac48569f5d2a71932b2daf516c3917d509b438d20df0de40ab SHA512 08d8a2afc9449e99cfca1e0bc8d034020a8887c5db865652ce6e8a17dc7aef3b01ac6dca4f41040daf41dde7498fe028c79e8c17a8bad2855f20c067d3d87b12
|
||||
DIST lsquic-4.0.8.tar.gz 1928212 BLAKE2B 4a4011fe86183ae0ac34f92a4695d18a8d635330e638038d7a78e9b04ebf49de657c666f523f4967163f81c77f033d856712bb04efc1c50fa8f50040d066a585 SHA512 45789e2024b60dbb2593b8708067b3aa833f818228c8b1d37840b6c8cb968d446cb74b5c9ace4a805b9dd5e91b5ad22fbf07e832b15b8f7ae480cfaafd67601b
|
||||
|
@ -1,154 +0,0 @@
|
||||
Modify the BoringSSL library to be included internally during LSQUIC construction, so that the BoringSSL library does not need to be installed by itself on the system.
|
||||
BoringSSL must always be built as static, so we intentionally removed the code that builds it as shared.
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 4c7b181..723a075 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -152,77 +152,6 @@ ELSE()
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
-IF (NOT DEFINED BORINGSSL_INCLUDE AND DEFINED BORINGSSL_DIR)
|
||||
- FIND_PATH(BORINGSSL_INCLUDE NAMES openssl/ssl.h
|
||||
- PATHS ${BORINGSSL_DIR}/include
|
||||
- NO_DEFAULT_PATH)
|
||||
-ENDIF()
|
||||
-# This must be done before adding other include directories to take
|
||||
-# precedence over header files from other SSL installs.
|
||||
-
|
||||
-IF (BORINGSSL_INCLUDE)
|
||||
- MESSAGE(STATUS "BoringSSL include directory ${BORINGSSL_INCLUDE}")
|
||||
- INCLUDE_DIRECTORIES(${BORINGSSL_INCLUDE})
|
||||
-ELSE()
|
||||
- MESSAGE(FATAL_ERROR "BoringSSL headers not found")
|
||||
-ENDIF()
|
||||
-
|
||||
-IF (NOT DEFINED BORINGSSL_LIB AND DEFINED BORINGSSL_DIR)
|
||||
- FOREACH(LIB_NAME ssl crypto)
|
||||
- IF (CMAKE_SYSTEM_NAME STREQUAL Windows)
|
||||
- FIND_LIBRARY(BORINGSSL_LIB_${LIB_NAME}
|
||||
- NAMES ${LIB_NAME}
|
||||
- PATHS ${BORINGSSL_DIR}/${LIB_NAME}
|
||||
- PATH_SUFFIXES Debug Release MinSizeRel RelWithDebInfo
|
||||
- NO_DEFAULT_PATH)
|
||||
- ELSE()
|
||||
- FIND_LIBRARY(BORINGSSL_LIB_${LIB_NAME}
|
||||
- NAMES lib${LIB_NAME}${LIB_SUFFIX}
|
||||
- PATHS ${BORINGSSL_DIR}/${LIB_NAME}
|
||||
- NO_DEFAULT_PATH)
|
||||
- ENDIF()
|
||||
- IF(BORINGSSL_LIB_${LIB_NAME})
|
||||
- MESSAGE(STATUS "Found ${LIB_NAME} library: ${BORINGSSL_LIB_${LIB_NAME}}")
|
||||
- ELSE()
|
||||
- MESSAGE(STATUS "${LIB_NAME} library not found")
|
||||
- ENDIF()
|
||||
- ENDFOREACH()
|
||||
-
|
||||
-ELSE()
|
||||
-
|
||||
-
|
||||
- FOREACH(LIB_NAME ssl crypto)
|
||||
- # If BORINGSSL_LIB is defined, try find each lib. Otherwise, user should define BORINGSSL_LIB_ssl,
|
||||
- # BORINGSSL_LIB_crypto and so on explicitly. For example, including boringssl and lsquic both via
|
||||
- # add_subdirectory:
|
||||
- # add_subdirectory(third_party/boringssl)
|
||||
- # set(BORINGSSL_LIB_ssl ssl)
|
||||
- # set(BORINGSSL_LIB_crypto crypto)
|
||||
- # add_subdirectory(third_party/lsquic)
|
||||
- IF (DEFINED BORINGSSL_LIB)
|
||||
- IF (CMAKE_SYSTEM_NAME STREQUAL Windows)
|
||||
- FIND_LIBRARY(BORINGSSL_LIB_${LIB_NAME}
|
||||
- NAMES ${LIB_NAME}
|
||||
- PATHS ${BORINGSSL_LIB}
|
||||
- PATH_SUFFIXES Debug Release MinSizeRel RelWithDebInfo
|
||||
- NO_DEFAULT_PATH)
|
||||
- ELSE()
|
||||
- FIND_LIBRARY(BORINGSSL_LIB_${LIB_NAME}
|
||||
- NAMES lib${LIB_NAME}${LIB_SUFFIX}
|
||||
- PATHS ${BORINGSSL_LIB}
|
||||
- PATH_SUFFIXES ${LIB_NAME}
|
||||
- NO_DEFAULT_PATH)
|
||||
- ENDIF()
|
||||
- ENDIF()
|
||||
- IF(BORINGSSL_LIB_${LIB_NAME})
|
||||
- MESSAGE(STATUS "Found ${LIB_NAME} library: ${BORINGSSL_LIB_${LIB_NAME}}")
|
||||
- ELSE()
|
||||
- MESSAGE(FATAL_ERROR "BORINGSSL_LIB_${LIB_NAME} library not found")
|
||||
- ENDIF()
|
||||
- ENDFOREACH()
|
||||
-
|
||||
-ENDIF()
|
||||
-
|
||||
SET(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||
INCLUDE_DIRECTORIES(include)
|
||||
IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "Darwin")
|
||||
@@ -268,7 +197,7 @@ ELSE()
|
||||
MESSAGE(STATUS "zlib not found")
|
||||
ENDIF()
|
||||
|
||||
-SET(LIBS lsquic ls-hpack ls-qpack ${BORINGSSL_LIB_ssl} ${BORINGSSL_LIB_crypto} ${ZLIB_LIB} ${LIBS})
|
||||
+SET(LIBS lsquic ls-hpack ls-qpack ssl crypto ${ZLIB_LIB} ${LIBS})
|
||||
|
||||
IF (LSQUIC_BIN)
|
||||
FIND_PATH(EVENT_INCLUDE_DIR NAMES event2/event.h)
|
||||
diff --git a/src/liblsquic/CMakeLists.txt b/src/liblsquic/CMakeLists.txt
|
||||
index be9a432..0bc806d 100644
|
||||
--- a/src/liblsquic/CMakeLists.txt
|
||||
+++ b/src/liblsquic/CMakeLists.txt
|
||||
@@ -1,4 +1,7 @@
|
||||
# Copyright (c) 2017 - 2022 LiteSpeed Technologies Inc. See LICENSE.
|
||||
+
|
||||
+add_subdirectory(boringssl)
|
||||
+
|
||||
SET(lsquic_STAT_SRCS
|
||||
lsquic_adaptive_cc.c
|
||||
lsquic_alarmset.c
|
||||
@@ -83,6 +86,8 @@ SET(lsquic_STAT_SRCS
|
||||
lsquic_version.c
|
||||
)
|
||||
|
||||
+include_directories(boringssl/include)
|
||||
+
|
||||
IF(NOT MSVC)
|
||||
SET(QPACK_FLAGS "-Wno-uninitialized")
|
||||
INCLUDE(CheckCCompilerFlag)
|
||||
@@ -119,7 +124,7 @@ endif()
|
||||
|
||||
IF(LSQUIC_SHARED_LIB)
|
||||
add_library(lsquic SHARED ${lsquic_STAT_SRCS})
|
||||
- TARGET_LINK_LIBRARIES(lsquic PRIVATE ${BORINGSSL_LIB_ssl} ${BORINGSSL_LIB_crypto} ${ZLIB_LIB})
|
||||
+ TARGET_LINK_LIBRARIES(lsquic PRIVATE ssl crypto ${ZLIB_LIB})
|
||||
IF(MSVC)
|
||||
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DLSQUIC_EXPORTS")
|
||||
TARGET_LINK_LIBRARIES(lsquic PRIVATE ws2_32.lib)
|
||||
diff --git a/src/liblsquic/boringssl/CMakeLists.txt b/src/liblsquic/boringssl/CMakeLists.txt
|
||||
index aac5f0d..37cbfa3 100644
|
||||
--- a/src/liblsquic/boringssl/CMakeLists.txt
|
||||
+++ b/src/liblsquic/boringssl/CMakeLists.txt
|
||||
@@ -3,6 +3,8 @@ cmake_minimum_required(VERSION 3.10)
|
||||
# Defer enabling C and CXX languages.
|
||||
project(BoringSSL NONE)
|
||||
|
||||
+set(BUILD_SHARED_LIBS OFF)
|
||||
+
|
||||
# Don't install BoringSSL to system directories by default; it has no stable
|
||||
# ABI. Instead, default to an "install" directory under the source.
|
||||
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
|
||||
@@ -36,7 +38,7 @@ if(CMAKE_VERSION VERSION_LESS "3.14")
|
||||
endif()
|
||||
|
||||
# Wrap the CMake install function so we can disable it.
|
||||
-set(INSTALL_ENABLED 1)
|
||||
+set(INSTALL_ENABLED 0)
|
||||
function(install_if_enabled)
|
||||
if(INSTALL_ENABLED)
|
||||
install(${ARGV})
|
||||
@@ -139,7 +141,7 @@ set(CMAKE_C_STANDARD_REQUIRED ON)
|
||||
if(CMAKE_COMPILER_IS_GNUCXX OR CLANG)
|
||||
# Note clang-cl is odd and sets both CLANG and MSVC. We base our configuration
|
||||
# primarily on our normal Clang one.
|
||||
- set(C_CXX_FLAGS "-Werror -Wformat=2 -Wsign-compare -Wmissing-field-initializers -Wwrite-strings -Wvla -Wshadow -Wtype-limits")
|
||||
+ set(C_CXX_FLAGS "-Wformat=2 -Wsign-compare -Wmissing-field-initializers -Wwrite-strings -Wvla -Wshadow -Wtype-limits -fPIC")
|
||||
if(MSVC)
|
||||
# clang-cl sets different default warnings than clang. It also treats -Wall
|
||||
# as -Weverything, to match MSVC. Instead -W3 is the alias for -Wall.
|
@ -1,51 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit cmake
|
||||
|
||||
BORINGSSL_COMMIT="15655052e8701f908937204785eaa8cd4363099f"
|
||||
|
||||
DESCRIPTION="LiteSpeed QUIC (LSQUIC) Library"
|
||||
HOMEPAGE="https://github.com/litespeedtech/lsquic/"
|
||||
SRC_URI="
|
||||
https://github.com/litespeedtech/lsquic/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
|
||||
https://github.com/google/boringssl/archive/${BORINGSSL_COMMIT}.tar.gz -> boringssl-fips-20230428.tar.gz
|
||||
"
|
||||
|
||||
S="${WORKDIR}/lsquic-${PV}"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm64"
|
||||
|
||||
IUSE="static-libs test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
DEPEND="
|
||||
dev-lang/go
|
||||
dev-libs/ls-qpack:=[static-libs=]
|
||||
dev-libs/ls-hpack:=[static-libs=]
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-disable-build-deps-libs.patch
|
||||
"${FILESDIR}"/${PN}-link-boringssl-static-libs.patch
|
||||
"${FILESDIR}"/${PN}-disable-override-flags.patch
|
||||
"${FILESDIR}"/${PN}-disable-boring-override-flags.patch
|
||||
)
|
||||
|
||||
src_unpack() {
|
||||
unpack ${P}.tar.gz
|
||||
unpack boringssl-fips-20230428.tar.gz
|
||||
mv boringssl-${BORINGSSL_COMMIT} "${S}"/src/liblsquic/boringssl || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DLSQUIC_SHARED_LIB=$(usex !static-libs)
|
||||
-DLSQUIC_TESTS=$(usex test)
|
||||
)
|
||||
cmake_src_configure
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user