Skip to content

[elfutils] Add libdebuginfod feature #26107

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

Closed
BigRedEye wants to merge 3 commits into from
Closed

[elfutils] Add libdebuginfod feature #26107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2011c17
[elfutils] Add libdebuginfod feature
BigRedEye Aug 1, 2022
10e77b7
Merge branch 'microsoft:master' into master
BigRedEye Aug 1, 2022
8c96c9d
style: Remove newline
BigRedEye Aug 2, 2022
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
15 changes: 15 additions & 0 deletions ports/elfutils/install-libdebuginfod.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff --git a/debuginfod/Makefile.am b/debuginfod/Makefile.am
index 3adb2755..db0eadab 100644
--- a/debuginfod/Makefile.am
+++ b/debuginfod/Makefile.am
@@ -76,8 +76,8 @@ debuginfod_find_SOURCES = debuginfod-find.c
debuginfod_find_LDADD = $(libdw) $(libelf) $(libeu) $(libdebuginfod) $(argp_LDADD) $(fts_LIBS)

if LIBDEBUGINFOD
-noinst_LIBRARIES = libdebuginfod.a
-noinst_LIBRARIES += libdebuginfod_pic.a
+lib_LIBRARIES = libdebuginfod.a
+noinst_LIBRARIES = libdebuginfod_pic.a
endif

libdebuginfod_a_SOURCES = debuginfod-client.c
25 changes: 21 additions & 4 deletions ports/elfutils/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,14 @@ vcpkg_from_git(
URL https://sourceware.org/git/elfutils
REF ca4a785fc3061c7d136b198e9ffe0b14cf90c2be #elfutils-0.186

PATCHES configure.ac.patch
PATCHES
configure.ac.patch
install-libdebuginfod.patch
Copy link
Copy Markdown
Member

@BillyONeal BillyONeal Aug 5, 2022

Choose a reason for hiding this comment

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

Can you explain in detail what this patch is doing?

Has it been submitted upstream?

)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
libdebuginfod WITH_LIBDEBUGINFOD
)

vcpkg_find_acquire_program(FLEX)
Expand All @@ -13,11 +20,17 @@ vcpkg_find_acquire_program(BISON)
get_filename_component(BISON_DIR "${BISON}" DIRECTORY )
vcpkg_add_to_path(PREPEND "${BISON_DIR}")

if(WITH_LIBDEBUGINFOD)
set(LIBDEBUGINFOD_FLAG yes)
else()
set(LIBDEBUGINFOD_FLAG dummy)
endif()

vcpkg_configure_make(
SOURCE_PATH ${SOURCE_PATH}
AUTOCONFIG
OPTIONS --disable-debuginfod
--enable-libdebuginfod=dummy
--enable-libdebuginfod=${LIBDEBUGINFOD_FLAG}
--with-zlib
--with-bzlib
--with-lzma
Expand All @@ -28,8 +41,12 @@ vcpkg_configure_make(
)

vcpkg_install_make()
file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libdebuginfod.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libdebuginfod.pc") #--disable-debuginfod
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/etc/debuginfod" "${CURRENT_PACKAGES_DIR}/etc/debuginfod")
if (WITH_LIBDEBUGINFOD)
Copy link
Copy Markdown
Member

@BillyONeal BillyONeal Aug 5, 2022

Choose a reason for hiding this comment

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

This seems like it can't be correct: Why are you deleting the bits backing the feature if the feature is on? (Is the sense of this if flipped?)

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/etc/debuginfod")
else()
file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libdebuginfod.pc" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libdebuginfod.pc") #--disable-debuginfod
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/etc/debuginfod" "${CURRENT_PACKAGES_DIR}/etc/debuginfod")
endif()

vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread)

Expand Down
12 changes: 10 additions & 2 deletions ports/elfutils/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "elfutils",
"version": "0.186",
"port-version": 4,
"port-version": 5,
"description": "elfutils is a collection of utilities and libraries to read, create and modify ELF binary files, find and handle DWARF debug data, symbols, thread state and stacktraces for processes and core files on GNU/Linux.",
"homepage": "https://sourceware.org/elfutils/",
"license": null,
Expand All @@ -11,5 +11,13 @@
"liblzma",
"zlib",
"zstd"
]
],
"features": {
"libdebuginfod": {
"description": "Enable debuginfod client",
"dependencies": [
"curl"
]
}
}
}
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 @@ -2098,7 +2098,7 @@
},
"elfutils": {
"baseline": "0.186",
"port-version": 4
"port-version": 5
},
"embree2": {
"baseline": "2.17.7",
Expand Down
5 changes: 5 additions & 0 deletions versions/e-/elfutils.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e82d824843a5903e0320975311eb0a0faa4ff1e1",
"version": "0.186",
"port-version": 5
},
{
"git-tree": "6f16a19e22e33e89ff809c74983035b93a50038e",
"version": "0.186",
Expand Down