nghttp3: add new package #22443
Merged
nghttp3: add new package #22443
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
BKPepe
reviewed
Oct 18, 2023
stangri
force-pushed
the
master-nghttp3
branch
from
07aecb3
to
679c6cf
Compare
stangri
added a commit
to stangri/packages
that referenced
this pull request
Oct 18, 2023
* these changes along with 2 PRs below and using non-standard openssl library allow for building curl with HTTP/3 support * openwrt#22443 * openwrt#22444 Signed-off-by: Stan Grishin <stangri@melmac.ca>
|
Sure, why not.
Dne ne 22. 10. 2023 16:24 uživatel Stan Grishin ***@***.***>
napsal:
… @BKPepe <https://github.com/BKPepe> @neheb <https://github.com/neheb> --
your thoughts on cherry-picking it for 23.05?
—
Reply to this email directly, view it on GitHub
<#22443 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AA7IDVFFIBUIS5DAMM67PDLYAUUBJAVCNFSM6AAAAAA6FXX6CWVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTONZUGEYDQOJWGY>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
|
Upstream supports CMake as well, would be nice to use it. (the same for ngtcp2) |
I've had limited experience/exposure with the Makefiles. Is it just a matter of adding If not, do you want to take over maintainership of these two libs and make necessary changes (either before or after this is merged)? |
Basically yes. diff --git a/libs/nghttp3/Makefile b/libs/nghttp3/Makefile
index 8ee97b3e84..29ecf73d27 100644
--- a/libs/nghttp3/Makefile
+++ b/libs/nghttp3/Makefile
@@ -12,10 +12,10 @@ PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=COPYING
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
+CMAKE_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
define Package/libnghttp3
SECTION:=libs
@@ -28,15 +28,7 @@ define Package/libnghttp3/description
nghttp3 is a thin HTTP/3 layer over an underlying QUIC stack.
endef
-CONFIGURE_ARGS += --enable-lib-only
-
-define Build/InstallDev
- $(INSTALL_DIR) $(1)/usr/include/nghttp3
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/nghttp3/*.h $(1)/usr/include/nghttp3/
- $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc $(1)/usr/lib/pkgconfig/
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libnghttp3.so* $(1)/usr/lib/
-endef
+CMAKE_OPTIONS += -DENABLE_LIB_ONLY=ON
define Package/libnghttp3/install
$(INSTALL_DIR) $(1)/usr/lib
|
* add new package to allow building of curl with HTTP/3 support * switch to using cmake Signed-off-by: Stan Grishin <stangri@melmac.ca>
stangri
force-pushed
the
master-nghttp3
branch
from
679c6cf
to
b1d4241
Compare
1715173329
approved these changes
Oct 23, 2023
stangri
added a commit
to stangri/packages
that referenced
this pull request
Oct 26, 2023
* these changes along with 2 PRs below and using non-standard openssl library allow for building curl with HTTP/3 support * openwrt#22443 * openwrt#22444 Signed-off-by: Stan Grishin <stangri@melmac.ca> (cherry picked from commit 6bd2b89)
stangri
added a commit
to stangri/packages
that referenced
this pull request
Oct 26, 2023
* these changes along with 2 PRs below and using non-standard openssl library allow for building curl with HTTP/3 support * openwrt#22443 * openwrt#22444 Signed-off-by: Stan Grishin <stangri@melmac.ca> (cherry picked from commit 6bd2b89)
jmv2009
pushed a commit
to jmv2009/packages
that referenced
this pull request
Oct 27, 2023
* these changes along with 2 PRs below and using non-standard openssl library allow for building curl with HTTP/3 support * openwrt#22443 * openwrt#22444 Signed-off-by: Stan Grishin <stangri@melmac.ca>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Maintainer: me
Compile tested: x86_64, Sophos XG-135r3, OpenWrt 23.05.0
Run tested: x86_64, Sophos XG-135r3, OpenWrt 23.05.0
Description:
PS. I'd like to solicit feedback on cherry-picking it for 23.05 as well.