From f5ec9f3d6532d16fde1dad423c82391cbc4084aa Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Mon, 23 May 2022 22:59:11 +0200 Subject: [PATCH] [elfutils] no absolute paths (#24846) --- ports/elfutils/portfile.cmake | 6 ++++++ ports/elfutils/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/e-/elfutils.json | 5 +++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ports/elfutils/portfile.cmake b/ports/elfutils/portfile.cmake index 58480ef419..450e3799b9 100644 --- a/ports/elfutils/portfile.cmake +++ b/ports/elfutils/portfile.cmake @@ -45,6 +45,12 @@ else() endif() file(GLOB_RECURSE TO_REMOVE "${CURRENT_PACKAGES_DIR}/lib/*${_lib_suffix}" "${CURRENT_PACKAGES_DIR}/debug/lib/*${_lib_suffix}" "${CURRENT_PACKAGES_DIR}/lib/*${_lib_suffix}.*" "${CURRENT_PACKAGES_DIR}/debug/lib/*${_lib_suffix}.*") file(REMOVE ${TO_REMOVE}) + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/etc/profile.d/debuginfod.sh" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../..") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/etc/profile.d/debuginfod.sh" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../..") + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/elfutils/bin/eu-make-debug-archive" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..") +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/elfutils/debug/bin/eu-make-debug-archive" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..") # # Handle copyright file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/elfutils/vcpkg.json b/ports/elfutils/vcpkg.json index 1e8588f325..e7b479013e 100644 --- a/ports/elfutils/vcpkg.json +++ b/ports/elfutils/vcpkg.json @@ -1,7 +1,7 @@ { "name": "elfutils", "version": "0.186", - "port-version": 2, + "port-version": 3, "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, diff --git a/versions/baseline.json b/versions/baseline.json index 98563a1e3b..d36f9fdb2e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2062,7 +2062,7 @@ }, "elfutils": { "baseline": "0.186", - "port-version": 2 + "port-version": 3 }, "embree2": { "baseline": "2.17.7", diff --git a/versions/e-/elfutils.json b/versions/e-/elfutils.json index 2bd68e50f6..9d6c48f7c4 100644 --- a/versions/e-/elfutils.json +++ b/versions/e-/elfutils.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f78ad2c6d0fe406f09a163e5fb74a9b000c815c", + "version": "0.186", + "port-version": 3 + }, { "git-tree": "03e8299432623718bf6b58a61d19d408b6c8828c", "version": "0.186",