Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[libarchive] Add Linux static build patch #38108

Closed
wants to merge 1 commit into from
Closed

[libarchive] Add Linux static build patch #38108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions ports/libarchive/fix-linux-static-build.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f4784d49..f9e8a190 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -672,6 +672,9 @@ ENDIF(ZSTD_FOUND)
MARK_AS_ADVANCED(CLEAR ZSTD_INCLUDE_DIR)
MARK_AS_ADVANCED(CLEAR ZSTD_LIBRARY)

+IF(UNIX AND NOT APPLE)
+ LIST(APPEND ADDITIONAL_LIBS "dl")
+ENDIF(UNIX AND NOT APPLE)
Comment on lines +9 to +11
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. This is not how to add dl and this is not when to add dl.


#
# Check headers
1 change: 1 addition & 0 deletions ports/libarchive/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ vcpkg_from_github(
fix-buildsystem.patch
fix-cpu-set.patch
fix-deps.patch
fix-linux-static-build.patch
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
Expand Down
1 change: 1 addition & 0 deletions ports/libarchive/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "libarchive",
"version": "3.7.2",
"port-version": 1,
"description": "Library for reading and writing streaming archives",
"homepage": "https://www.libarchive.org",
"license": null,
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4154,7 +4154,7 @@
},
"libarchive": {
"baseline": "3.7.2",
"port-version": 0
"port-version": 1
},
"libass": {
"baseline": "0.17.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libarchive.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "39600cd4eec5d0fe3c38924848c80d3b9055231a",
"version": "3.7.2",
"port-version": 1
},
{
"git-tree": "72eaf4987dd61116706a4279e7789f2a386a05cf",
"version": "3.7.2",
Expand Down
Loading