mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-28 08:59:07 +08:00
[dbus] dbus-daemon, dbus-launch,... are first class artifacts (#37736)
dbus-daemon, dbus-launch and the other executables in the dbus port are integral components of the D-Bus system. libdbus-1 is of no utility in itself without dbus-daemon. A case could be made that libdbus-1 in Vcpkg could be used on Linux against the distro-provided dbus-daemon, but this is not true on Windows and other platforms where the dbus package is also available (and usefully so). Therefore these executables must be treated as first-class artifacts in the vcpkg port that can be installed along with shared libraries to a prefix by consuming applications. The release version of the dbus-* executables are available in the tools folder, but that leaves a hole for dynamically linked debug builds. These cannot install the dbus-* executables from the tools folder as they are release binaries that are not (necessarily) compatible with the installed libdbus-1.so/dll and other shared library dependencies. To properly support debug builds with dynamic linking the debug variant of these executables must also be preserved. They cannot be moved to tools/<port>/debug as that change of directory layout is not compatible with the RUNPATH in the executables [$ORIGIN:$ORIGIN/../../lib]. Instead all dbus-* executables are left in the bin and bin/debug layout. Fixes #37625 - [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [x] SHA512s are updated for each updated download. - [x] The "supports" clause reflects platforms that may be fixed by this new version. - [x] Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file. - [x] Any patches that are no longer applied are deleted from the port's directory. - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [x] Only one version is added to each modified port's versions file. Co-authored-by: Jon <v-zhli17@microsoft.com>
This commit is contained in:
parent
352c108a6b
commit
01246903ea
@ -83,6 +83,7 @@ else()
|
|||||||
list(APPEND TOOLS cleanup-sockets uuidgen)
|
list(APPEND TOOLS cleanup-sockets uuidgen)
|
||||||
endif()
|
endif()
|
||||||
list(TRANSFORM TOOLS PREPEND "dbus-" )
|
list(TRANSFORM TOOLS PREPEND "dbus-" )
|
||||||
|
vcpkg_copy_tools(TOOL_NAMES ${TOOLS} SEARCH_DIR ${CURRENT_PACKAGES_DIR}/debug/bin DESTINATION "${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}")
|
||||||
vcpkg_copy_tools(TOOL_NAMES ${TOOLS} AUTO_CLEAN)
|
vcpkg_copy_tools(TOOL_NAMES ${TOOLS} AUTO_CLEAN)
|
||||||
|
|
||||||
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "dbus",
|
"name": "dbus",
|
||||||
"version": "1.15.8",
|
"version": "1.15.8",
|
||||||
"port-version": 2,
|
"port-version": 3,
|
||||||
"description": "D-Bus specification and reference implementation, including libdbus and dbus-daemon",
|
"description": "D-Bus specification and reference implementation, including libdbus and dbus-daemon",
|
||||||
"homepage": "https://gitlab.freedesktop.org/dbus/dbus",
|
"homepage": "https://gitlab.freedesktop.org/dbus/dbus",
|
||||||
"license": "AFL-2.1 OR GPL-2.0-or-later",
|
"license": "AFL-2.1 OR GPL-2.0-or-later",
|
||||||
|
@ -2190,7 +2190,7 @@
|
|||||||
},
|
},
|
||||||
"dbus": {
|
"dbus": {
|
||||||
"baseline": "1.15.8",
|
"baseline": "1.15.8",
|
||||||
"port-version": 2
|
"port-version": 3
|
||||||
},
|
},
|
||||||
"dcmtk": {
|
"dcmtk": {
|
||||||
"baseline": "3.6.8",
|
"baseline": "3.6.8",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "86fbdb4cf82ddaf47ec2fd41bf040765b912c589",
|
||||||
|
"version": "1.15.8",
|
||||||
|
"port-version": 3
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "d91a1718705f5d0d6ba7922cf832759a58469ff8",
|
"git-tree": "d91a1718705f5d0d6ba7922cf832759a58469ff8",
|
||||||
"version": "1.15.8",
|
"version": "1.15.8",
|
||||||
|
Loading…
Reference in New Issue
Block a user