-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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
libcap/2.73: Bump version #26246
Merged
Merged
libcap/2.73: Bump version #26246
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
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
26 changes: 26 additions & 0 deletions
26
recipes/libcap/all/patches/2.73/0001-libcap-Remove-hardcoded-fPIC.patch
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
From 8b86ac7b057ce529900969ead958a9ca7ae85b3c Mon Sep 17 00:00:00 2001 | ||
From: Sergey Bobrenok <[email protected]> | ||
Date: Sun, 22 Dec 2024 20:30:31 +0700 | ||
Subject: [PATCH 1/2] libcap: Remove hardcoded -fPIC | ||
|
||
Signed-off-by: Sergey Bobrenok <[email protected]> | ||
--- | ||
libcap/Makefile | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/libcap/Makefile b/libcap/Makefile | ||
index 5f5c601..02be223 100644 | ||
--- a/libcap/Makefile | ||
+++ b/libcap/Makefile | ||
@@ -19,7 +19,7 @@ PSXFILES=../psx/psx ../psx/wrap/psx_wrap | ||
PSXMAGICOBJ=psx_magic.o | ||
|
||
# Always build libcap sources this way: | ||
-CFLAGS += -fPIC -D_LIBPSX_PTHREAD_LINKAGE | ||
+CFLAGS += -D_LIBPSX_PTHREAD_LINKAGE | ||
|
||
# https://bugzilla.kernel.org/show_bug.cgi?id=219168 | ||
OVERRIDE_BSYMBOLIC_FUNCTIONS := -Wl,-Bsymbolic-functions | ||
-- | ||
2.47.1 | ||
|
33 changes: 33 additions & 0 deletions
33
recipes/libcap/all/patches/2.73/0002-Make.Rules-Make-compile-tools-configurable.patch
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
From 903c526352f0cea70200c3f3231dffce8d1c9621 Mon Sep 17 00:00:00 2001 | ||
From: Sergey Bobrenok <[email protected]> | ||
Date: Sun, 22 Dec 2024 20:52:43 +0700 | ||
Subject: [PATCH 2/2] Make.Rules: Make compile tools configurable | ||
|
||
Signed-off-by: Sergey Bobrenok <[email protected]> | ||
--- | ||
Make.Rules | 8 ++++---- | ||
1 file changed, 4 insertions(+), 4 deletions(-) | ||
|
||
diff --git a/Make.Rules b/Make.Rules | ||
index d349697..7bec1af 100644 | ||
--- a/Make.Rules | ||
+++ b/Make.Rules | ||
@@ -66,11 +66,11 @@ DEFINES := -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 | ||
SYSTEM_HEADERS = /usr/include | ||
|
||
SUDO := sudo | ||
-CC := $(CROSS_COMPILE)gcc | ||
+CC ?= $(CROSS_COMPILE)gcc | ||
LD := $(CC) -Wl,-x -shared -Wl,-shared | ||
-AR := $(CROSS_COMPILE)ar | ||
-RANLIB := $(CROSS_COMPILE)ranlib | ||
-OBJCOPY := $(CROSS_COMPILE)objcopy | ||
+AR ?= $(CROSS_COMPILE)ar | ||
+RANLIB ?= $(CROSS_COMPILE)ranlib | ||
+OBJCOPY ?= $(CROSS_COMPILE)objcopy | ||
|
||
# Reference: | ||
# CPPFLAGS used for building .o files from .c & .h files | ||
-- | ||
2.47.1 | ||
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,6 @@ | ||
versions: | ||
"2.73": | ||
folder: all | ||
"2.70": | ||
folder: all | ||
"2.69": | ||
|
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.
Hi @bobrofon, Why is this line added if nothing similar was added in the previous patch? I couldn’t find anything
upstream—could you help me? 😄
https://github.com/conan-io/conan-center-index/blob/master/recipes/libcap/all/patches/2.57/0001-libcap-Remove-hardcoded-fPIC.patch#L21
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.
In the previous patch, the
-fPIC
flag was removed fromCFLAGS
. In this patch, the-fPIC
flag is also removed fromCFLAGS
. Honestly, I don't see any difference.-CFLAGS += -fPIC
vs
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 associated change in the upstream: https://git.kernel.org/pub/scm/libs/libcap/libcap.git/diff/libcap/Makefile?id=libcap-2.73&id2=libcap-2.70