* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/lsquic/files/, dev-libs/lsquic/
@ 2023-07-02 13:06 Florian Schmaus
0 siblings, 0 replies; 4+ messages in thread
From: Florian Schmaus @ 2023-07-02 13:06 UTC (permalink / raw
To: gentoo-commits
commit: 639a8db9b113179e86958249db5a9f49ed18e4f7
Author: Lucio Sauer <watermanpaint <AT> posteo <DOT> net>
AuthorDate: Sun Jul 2 11:33:14 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Jul 2 12:11:15 2023 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=639a8db9
dev-libs/lsquic: treeclean
* Depends on to-be-removed dev-libs/boringssl
* Could be reintroduced after this issue gets resolved:
https://github.com/litespeedtech/lsquic/issues/113
* Gentoo dev has acknowledged this change on IRC:
[12:31] colores: I'd like to fix the VisibleVcsPkg in dev-libs/* but I'm unsure about how to proceed
with dev-libs/boringssl-fips. The authors explicitly discourage you from installing
it system-wide (see
https://github.com/gentoo/guru/commit/a45331733cf318e1e81901bc64a64540afe2ad59#commitcomment-120138949).
Do I remove this package and it's revdeps?
[12:58] + sam_: yes, it shouldn't even be packaged, really
[12:58] + sam_: doe something depend on it, colores?
Closes: https://bugs.gentoo.org/909502
Signed-off-by: Lucio Sauer <watermanpaint <AT> posteo.net>
.../files/disable-lsquic-build-deps-libs.patch | 34 -----------------
.../files/fix-lsquic-boringssl-not-found.patch | 30 ---------------
dev-libs/lsquic/lsquic-3.2.0.ebuild | 44 ----------------------
dev-libs/lsquic/metadata.xml | 11 ------
4 files changed, 119 deletions(-)
diff --git a/dev-libs/lsquic/files/disable-lsquic-build-deps-libs.patch b/dev-libs/lsquic/files/disable-lsquic-build-deps-libs.patch
deleted file mode 100644
index 9a9a14c95..000000000
--- a/dev-libs/lsquic/files/disable-lsquic-build-deps-libs.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/src/liblsquic/CMakeLists.txt
-+++ b/src/liblsquic/CMakeLists.txt
-@@ -1,6 +1,6 @@
- # Copyright (c) 2017 - 2022 LiteSpeed Technologies Inc. See LICENSE.
- SET(lsquic_STAT_SRCS
-- ls-qpack/lsqpack.c
-+# ls-qpack/lsqpack.c
- lsquic_adaptive_cc.c
- lsquic_alarmset.c
- lsquic_arr.c
-@@ -100,10 +100,10 @@ IF(PROJECT_NAME STREQUAL "openlitespeed")
- INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/spdy)
- ELSE()
- INCLUDE_DIRECTORIES(../lshpack)
-- SET(lsquic_STAT_SRCS ${lsquic_STAT_SRCS}
-- lsquic_xxhash.c
-- ../lshpack/lshpack.c
-- )
-+# SET(lsquic_STAT_SRCS ${lsquic_STAT_SRCS}
-+# lsquic_xxhash.c
-+# ../lshpack/lshpack.c
-+# )
- ENDIF()
-
- ADD_CUSTOM_COMMAND(
-@@ -119,6 +119,8 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DXXH_HEADER_NAME=\\\"lsquic_xxhash.h\\\"")
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DLSQPACK_ENC_LOGGER_HEADER=\\\"lsquic_qpack_enc_logger.h\\\"")
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DLSQPACK_DEC_LOGGER_HEADER=\\\"lsquic_qpack_dec_logger.h\\\"")
-
-+link_libraries(ls-qpack ls-hpack)
-+
- if(NEED_LIBRT_FOR_clock_getres)
- target_link_libraries(lsquic PRIVATE ${RT_LIBRARY})
- endif()
diff --git a/dev-libs/lsquic/files/fix-lsquic-boringssl-not-found.patch b/dev-libs/lsquic/files/fix-lsquic-boringssl-not-found.patch
deleted file mode 100644
index 691edf238..000000000
--- a/dev-libs/lsquic/files/fix-lsquic-boringssl-not-found.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -154,7 +154,7 @@ ENDIF()
-
- IF (NOT DEFINED BORINGSSL_INCLUDE AND DEFINED BORINGSSL_DIR)
- FIND_PATH(BORINGSSL_INCLUDE NAMES openssl/ssl.h
-- PATHS ${BORINGSSL_DIR}/include
-+ PATHS ${BORINGSSL_DIR}/include/boringssl
- NO_DEFAULT_PATH)
- ENDIF()
- # This must be done before adding other include directories to take
---- a/bin/CMakeLists.txt
-+++ b/bin/CMakeLists.txt
-@@ -1,5 +1,6 @@
- # Copyright (c) 2017 - 2022 LiteSpeed Technologies Inc. See LICENSE.
-
-+link_directories("/usr/lib64/boringssl")
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
- LIST(APPEND LIBS ${EVENT_LIB})
-
---- a/src/liblsquic/CMakeLists.txt
-+++ b/src/liblsquic/CMakeLists.txt
-@@ -94,6 +94,7 @@ IF(NOT MSVC)
- set_source_files_properties(ls-qpack/lsqpack.c PROPERTIES COMPILE_FLAGS ${QPACK_FLAGS})
- ENDIF()
-
-+link_directories(/usr/lib64/boringssl)
- include_directories(ls-qpack)
-
- IF(PROJECT_NAME STREQUAL "openlitespeed")
diff --git a/dev-libs/lsquic/lsquic-3.2.0.ebuild b/dev-libs/lsquic/lsquic-3.2.0.ebuild
deleted file mode 100644
index 2035dab73..000000000
--- a/dev-libs/lsquic/lsquic-3.2.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake git-r3
-
-DESCRIPTION="LiteSpeed QUIC (LSQUIC) Library"
-HOMEPAGE="https://github.com/litespeedtech/lsquic/"
-EGIT_REPO_URI="https://github.com/litespeedtech/lsquic/"
-EGIT_COMMIT="3bbf683f25ab84826951350c57ae226c88c54422"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="static-libs"
-
-DEPEND="
- dev-libs/boringssl-fips:=[static-libs=]
- dev-libs/ls-hpack:=[static-libs=]
- dev-libs/ls-qpack:=[static-libs=]
-"
-
-PATCHES=(
- "${FILESDIR}"/disable-${PN}-build-deps-libs.patch
- "${FILESDIR}"/fix-${PN}-boringssl-not-found.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DLSQUIC_SHARED_LIB=$(usex !static-libs)
- -DBORINGSSL_DIR=/usr
- -DBORINGSSL_LIB_ssl=ssl
- -DBORINGSSL_LIB_crypto=crypto
- )
- cmake_src_configure
-}
-
-pkg_preinst() {
- mkdir -p ${D}/usr/include/liblsquic/
- cp -a ${S}/src/liblsquic/lsquic_logger.h ${D}/usr/include/liblsquic/
- cp -a ${S}/src/liblsquic/lsquic_stock_shi.h ${D}/usr/include/liblsquic/
- cp -a ${S}/src/liblsquic/lsquic_shared_support.h ${D}/usr/include/
-}
diff --git a/dev-libs/lsquic/metadata.xml b/dev-libs/lsquic/metadata.xml
deleted file mode 100644
index 5813d666a..000000000
--- a/dev-libs/lsquic/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>trakrailysurely@danceylove.net</email>
- <name>Okamura Kazuya</name>
- </maintainer>
- <upstream>
- <remote-id type="github">litespeedtech/lsquic</remote-id>
- </upstream>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/lsquic/files/, dev-libs/lsquic/
@ 2024-04-29 21:27 David Roman
0 siblings, 0 replies; 4+ messages in thread
From: David Roman @ 2024-04-29 21:27 UTC (permalink / raw
To: gentoo-commits
commit: 3985e07f8bb54ffdddd942177476db6b6d79005b
Author: Okamura Kazuya <gentoo-guru <AT> danceylove <DOT> net>
AuthorDate: Mon Apr 29 01:28:23 2024 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Mon Apr 29 01:28:23 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3985e07f
dev-libs/lsquic: Remove overwrites CFLAGS/CXXFLAGS
Signed-off-by: Okamura Kazuya <gentoo-guru <AT> danceylove.net>
.../lsquic-disable-boring-override-flags.patch | 26 +++++++++++
dev-libs/lsquic/lsquic-4.0.8-r1.ebuild | 51 ++++++++++++++++++++++
2 files changed, 77 insertions(+)
diff --git a/dev-libs/lsquic/files/lsquic-disable-boring-override-flags.patch b/dev-libs/lsquic/files/lsquic-disable-boring-override-flags.patch
new file mode 100644
index 0000000000..e2c58cf12d
--- /dev/null
+++ b/dev-libs/lsquic/files/lsquic-disable-boring-override-flags.patch
@@ -0,0 +1,26 @@
+diff --git a/src/liblsquic/boringssl/CMakeLists.txt b/src/liblsquic/boringssl/CMakeLists.txt
+index 39352d684..cc0f9470f 100644
+--- a/src/liblsquic/boringssl/CMakeLists.txt
++++ b/src/liblsquic/boringssl/CMakeLists.txt
+@@ -112,12 +112,6 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CLANG)
+ # See http://llvm.org/viewvc/llvm-project?view=revision&revision=319116
+ set(C_CXX_FLAGS "${C_CXX_FLAGS} -W3 -Wno-unused-parameter -fmsc-version=1900")
+ else()
+- if(EMSCRIPTEN)
+- # emscripten's emcc/clang does not accept the "-ggdb" flag.
+- set(C_CXX_FLAGS "${C_CXX_FLAGS} -g")
+- else()
+- set(C_CXX_FLAGS "${C_CXX_FLAGS} -ggdb")
+- endif()
+
+ set(C_CXX_FLAGS "${C_CXX_FLAGS} -Wall -fvisibility=hidden -fno-common")
+ endif()
+@@ -271,8 +265,6 @@ if(CFI)
+ # We use Chromium's copy of clang, which requires -fuse-ld=lld if building
+ # with -flto. That, in turn, can't handle -ggdb.
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=lld")
+- string(REPLACE "-ggdb" "-g" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+- string(REPLACE "-ggdb" "-g" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ # -flto causes object files to contain LLVM bitcode. Mixing those with
+ # assembly output in the same static library breaks the linker.
+ set(OPENSSL_NO_ASM "1")
diff --git a/dev-libs/lsquic/lsquic-4.0.8-r1.ebuild b/dev-libs/lsquic/lsquic-4.0.8-r1.ebuild
new file mode 100644
index 0000000000..0c1518a1e5
--- /dev/null
+++ b/dev-libs/lsquic/lsquic-4.0.8-r1.ebuild
@@ -0,0 +1,51 @@
+# 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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/lsquic/files/, dev-libs/lsquic/
@ 2025-02-03 11:38 David Roman
0 siblings, 0 replies; 4+ messages in thread
From: David Roman @ 2025-02-03 11:38 UTC (permalink / raw
To: gentoo-commits
commit: 1058b7fa3259543108edae8b2e27a66e66645f57
Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Sun Feb 2 08:27:44 2025 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Sun Feb 2 08:27:44 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1058b7fa
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 <AT> gmail.com>
dev-libs/lsquic/Manifest | 1 -
.../files/lsquic-link-boringssl-static-libs.patch | 154 ---------------------
dev-libs/lsquic/lsquic-4.0.8-r1.ebuild | 51 -------
3 files changed, 206 deletions(-)
diff --git a/dev-libs/lsquic/Manifest b/dev-libs/lsquic/Manifest
index 99de68bfe..5c50a6c53 100644
--- a/dev-libs/lsquic/Manifest
+++ b/dev-libs/lsquic/Manifest
@@ -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
diff --git a/dev-libs/lsquic/files/lsquic-link-boringssl-static-libs.patch b/dev-libs/lsquic/files/lsquic-link-boringssl-static-libs.patch
deleted file mode 100644
index 27cf305ae..000000000
--- a/dev-libs/lsquic/files/lsquic-link-boringssl-static-libs.patch
+++ /dev/null
@@ -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.
diff --git a/dev-libs/lsquic/lsquic-4.0.8-r1.ebuild b/dev-libs/lsquic/lsquic-4.0.8-r1.ebuild
deleted file mode 100644
index 0c1518a1e..000000000
--- a/dev-libs/lsquic/lsquic-4.0.8-r1.ebuild
+++ /dev/null
@@ -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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: dev-libs/lsquic/files/, dev-libs/lsquic/
@ 2025-02-03 11:38 David Roman
0 siblings, 0 replies; 4+ messages in thread
From: David Roman @ 2025-02-03 11:38 UTC (permalink / raw
To: gentoo-commits
commit: 96b7067ea4ea8da43b0883a44c1a5deb824d1808
Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Sun Feb 2 08:27:44 2025 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Sun Feb 2 08:27:44 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=96b7067e
dev-libs/lsquic: add 4.0.12
Closes: https://bugs.gentoo.org/945037
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>
dev-libs/lsquic/Manifest | 1 +
dev-libs/lsquic/files/lsquic-c23.patch | 17 +++++++++++
dev-libs/lsquic/lsquic-4.0.12.ebuild | 54 ++++++++++++++++++++++++++++++++++
3 files changed, 72 insertions(+)
diff --git a/dev-libs/lsquic/Manifest b/dev-libs/lsquic/Manifest
index e65bbcc47..99de68bfe 100644
--- a/dev-libs/lsquic/Manifest
+++ b/dev-libs/lsquic/Manifest
@@ -1,3 +1,4 @@
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
diff --git a/dev-libs/lsquic/files/lsquic-c23.patch b/dev-libs/lsquic/files/lsquic-c23.patch
new file mode 100644
index 000000000..02b6a4c18
--- /dev/null
+++ b/dev-libs/lsquic/files/lsquic-c23.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/945037
+https://github.com/litespeedtech/lsquic/pull/528/
+Remove unused function parameter for C23 compatibility
+
+In C23, `void foo()` is equivalent to `void foo(void)`, which causes a
+conflicting type error for lsquic_data_in_error_new.
+--- a/src/liblsquic/lsquic_di_error.c
++++ b/src/liblsquic/lsquic_di_error.c
+@@ -21,7 +21,7 @@ static const struct data_in *error_data_in_ptr;
+
+
+ struct data_in *
+-lsquic_data_in_error_new (struct lsquic_conn_public *conn_pub)
++lsquic_data_in_error_new ()
+ {
+ return (struct data_in *) error_data_in_ptr;
+ }
diff --git a/dev-libs/lsquic/lsquic-4.0.12.ebuild b/dev-libs/lsquic/lsquic-4.0.12.ebuild
new file mode 100644
index 000000000..7163e9ef5
--- /dev/null
+++ b/dev-libs/lsquic/lsquic-4.0.12.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+BORINGSSL_COMMIT="9fc1c33e9c21439ce5f87855a6591a9324e569fd"
+
+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-9fc1c.tar.gz
+"
+
+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=]
+"
+RDEPEND="
+ ${DEPEND}
+ sys-libs/zlib
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-disable-build-deps-libs.patch
+ "${FILESDIR}"/${PN}-link-boringssl-static-libs-9fc1c.patch
+ "${FILESDIR}"/${PN}-disable-override-flags.patch
+ "${FILESDIR}"/${PN}-disable-boring-override-flags.patch
+ "${FILESDIR}"/${PN}-c23.patch
+)
+
+src_unpack() {
+ unpack ${P}.tar.gz
+ unpack boringssl-9fc1c.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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-02-03 11:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-03 11:38 [gentoo-commits] repo/proj/guru:master commit in: dev-libs/lsquic/files/, dev-libs/lsquic/ David Roman
-- strict thread matches above, loose matches on Subject: below --
2025-02-03 11:38 David Roman
2024-04-29 21:27 David Roman
2023-07-02 13:06 Florian Schmaus
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox