mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-27 19:59:06 +08:00
[vcpkg baseline][vcpkg scripts] Drop ${pc_sysrootdir}
(#36843)
Fixes xcb-util-errors baseline regression.
This commit is contained in:
parent
46c5f1fff1
commit
523d1b4811
@ -1,20 +0,0 @@
|
||||
diff --git a/src/extensions.py b/src/extensions.py
|
||||
index 94d7d57fe..022d4003e 100644
|
||||
--- a/src/extensions.py
|
||||
+++ b/src/extensions.py
|
||||
@@ -1,5 +1,6 @@
|
||||
#!/usr/bin/env python
|
||||
import sys
|
||||
+import glob
|
||||
from xml.etree.cElementTree import parse
|
||||
|
||||
class Module(object):
|
||||
@@ -83,7 +84,7 @@ def parseFile(filename):
|
||||
|
||||
# Parse the xml file
|
||||
output_file = sys.argv[1]
|
||||
-for input_file in sys.argv[2:]:
|
||||
+for input_file in glob.glob(sys.argv[2]):
|
||||
parseFile(input_file)
|
||||
|
||||
assert xproto != None
|
@ -1,10 +1,7 @@
|
||||
if(NOT X_VCPKG_FORCE_VCPKG_X_LIBRARIES AND NOT VCPKG_TARGET_IS_WINDOWS)
|
||||
message(STATUS "Utils and libraries provided by '${PORT}' should be provided by your system! Install the required packages or force vcpkg libraries by setting X_VCPKG_FORCE_VCPKG_X_LIBRARIES in your triplet!")
|
||||
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
|
||||
else()
|
||||
|
||||
if(VCPKG_TARGET_IS_WINDOWS)
|
||||
set(PATCHES fix_python.patch)
|
||||
return()
|
||||
endif()
|
||||
|
||||
vcpkg_from_gitlab(
|
||||
@ -14,7 +11,6 @@ vcpkg_from_gitlab(
|
||||
REF 517dd82c079de762a7426f20166a44f11e8d38c5 #1.0.1
|
||||
SHA512 391f6bc9452bf4d6a3f1fa69232cdbef43f9fcd339b8d1965132a3b227ed7ebcbaad553fe64d42bc525811caedf3ff9d5bec108f6ac2efd5a014f75fb35cbf85
|
||||
HEAD_REF master
|
||||
PATCHES ${PATCHES}
|
||||
)
|
||||
file(TOUCH "${SOURCE_PATH}/m4/dummy")
|
||||
set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"")
|
||||
@ -36,5 +32,3 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||
|
||||
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
endif()
|
||||
|
||||
|
@ -1,6 +1,7 @@
|
||||
{
|
||||
"name": "xcb-util-errors",
|
||||
"version": "1.0.1",
|
||||
"port-version": 1,
|
||||
"description": "XCB utility library that gives human readable names to error, event, & request codes.",
|
||||
"homepage": "https://xcb.freedesktop.org/",
|
||||
"license": null,
|
||||
|
@ -3,6 +3,10 @@ function(z_vcpkg_fixup_pkgconfig_process_data arg_variable arg_config arg_prefix
|
||||
# to use LF instead of CRLF. This allows to use simpler regex matches.
|
||||
string(REPLACE "\r\n" "\n" contents "\n${${arg_variable}}\n")
|
||||
|
||||
# We use ${pcfiledir} for relocatable pc files, and on windows,
|
||||
# pkgconf initializes ${pc_sysrootdir} to invalid '/'.
|
||||
string(REPLACE [[${pc_sysrootdir}]] "" contents "${contents}")
|
||||
|
||||
string(REPLACE "${CURRENT_PACKAGES_DIR}" [[${prefix}]] contents "${contents}")
|
||||
string(REPLACE "${CURRENT_INSTALLED_DIR}" [[${prefix}]] contents "${contents}")
|
||||
if(VCPKG_HOST_IS_WINDOWS)
|
||||
|
@ -9330,7 +9330,7 @@
|
||||
},
|
||||
"xcb-util-errors": {
|
||||
"baseline": "1.0.1",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"xcb-util-m4": {
|
||||
"baseline": "2022-01-24",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "8deabed62d4ee817fc4c913c8f4c21dc9a13609b",
|
||||
"version": "1.0.1",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "b4f1619f7e94fe694b69d8021d6864e0d0369ce8",
|
||||
"version": "1.0.1",
|
||||
|
Loading…
Reference in New Issue
Block a user