-
Notifications
You must be signed in to change notification settings - Fork 507
Test updated libmount library #6776
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.
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
Closed
+95
−0
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
15 changes: 15 additions & 0 deletions
15
3rdParty/vcpkg_ports/ports/libmount/hide-private-symbols.diff
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| diff --git a/include/strutils.h b/include/strutils.h | ||
| index e9f8a0c..2f6d285 100644 | ||
| --- a/include/strutils.h | ||
| +++ b/include/strutils.h | ||
| @@ -16,6 +16,10 @@ | ||
|
|
||
| #include "c.h" | ||
|
|
||
| +// private, and clashing with libsystemd. | ||
| +#define parse_size ul__parse_size | ||
| +#define parse_range ul__parse_range | ||
| + | ||
| /* initialize a custom exit code for all *_or_err functions */ | ||
| extern void strutils_set_exitcode(int exit_code); | ||
|
|
||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change | ||
|---|---|---|---|---|
| @@ -0,0 +1,57 @@ | ||||
| string(REGEX MATCH "^([0-9]+\\.[0-9]+)" VERSION_SHORT "${VERSION}") | ||||
|
|
||||
| vcpkg_download_distfile(ARCHIVE | ||||
| URLS "https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v${VERSION_SHORT}/util-linux-${VERSION}.tar.xz" | ||||
| FILENAME "util-linux-${VERSION}.tar.xz" | ||||
| SHA512 3d299f0e05a4c982a04dbcbaaeff1222152feedf51c56c5dbdeb75999c68269d652a994f5cdf4c1ee42bb7b28475dd0792192c299fd9bc3b45198c5b153dad00 | ||||
| ) | ||||
|
|
||||
| vcpkg_extract_source_archive( | ||||
| SOURCE_PATH | ||||
| ARCHIVE "${ARCHIVE}" | ||||
| SOURCE_BASE ${VERSION} | ||||
| PATCHES | ||||
| hide-private-symbols.diff | ||||
| ) | ||||
|
|
||||
| set(ENV{GTKDOCIZE} true) | ||||
|
|
||||
| vcpkg_list(SET options) | ||||
| if("nls" IN_LIST FEATURES) | ||||
| vcpkg_list(APPEND options "--enable-nls") | ||||
| else() | ||||
| set(ENV{AUTOPOINT} true) # true, the program | ||||
| vcpkg_list(APPEND options "--disable-nls") | ||||
| endif() | ||||
| if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") | ||||
| vcpkg_list(APPEND options "--disable-year2038") | ||||
| endif() | ||||
|
|
||||
| vcpkg_configure_make( | ||||
| AUTOCONFIG | ||||
| SOURCE_PATH "${SOURCE_PATH}" | ||||
| OPTIONS | ||||
| ${options} | ||||
| --disable-asciidoc | ||||
| --disable-all-programs | ||||
| --disable-dependency-tracking | ||||
| --enable-libmount | ||||
| --enable-libblkid | ||||
| "--mandir=${CURRENT_PACKAGES_DIR}/share/man" | ||||
| ) | ||||
|
|
||||
| vcpkg_install_make() | ||||
| vcpkg_fixup_pkgconfig() | ||||
|
|
||||
|
|
||||
|
||||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,23 @@ | ||||||
| { | ||||||
| "name": "libmount", | ||||||
| "version": "2.41.3", | ||||||
| "description": "Block device identification library from util-linux", | ||||||
|
||||||
| "description": "Block device identification library from util-linux", | |
| "description": "Library to handle mount table parsing and manipulation", |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The patch file has an incorrectly formatted line. Line 0 should be line 4 in the unified diff format. The correct format should show line 3 as '--- a/include/strutils.h' and line 4 as '+++ b/include/strutils.h'. The line marked as '0' disrupts the standard unified diff format and may cause patch application to fail.