Skip to content

Commit 1e1a00b

Browse files
authored
[pkgconf] Add paths for FreeBSD (#47008)
1 parent 26eb950 commit 1e1a00b

File tree

4 files changed

+13
-3
lines changed

4 files changed

+13
-3
lines changed

ports/pkgconf/portfile.cmake

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,12 @@ set(PKG_DEFAULT_PATH "")
2121
set(SYSTEM_INCLUDEDIR "")
2222
set(PERSONALITY_PATH "personality.d")
2323

24-
25-
if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_CROSSCOMPILING AND VCPKG_TARGET_ARCHITECTURE MATCHES "x64")
24+
if(VCPKG_TARGET_IS_FREEBSD)
25+
# These are taken from the FreeBSD port of pkgconf
26+
set(SYSTEM_INCLUDEDIR "/usr/include")
27+
set(SYSTEM_LIBDIR "/usr/lib")
28+
set(PKG_DEFAULT_PATH "/usr/libdata/pkgconfig:/usr/local/libdata/pkgconfig:/usr/local/share/pkgconfig")
29+
elseif(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_CROSSCOMPILING AND VCPKG_TARGET_ARCHITECTURE MATCHES "x64")
2630
# These defaults are obtained from pkgconf/pkg-config on Ubuntu and OpenSuse
2731
# vcpkg cannot do system introspection to obtain/set these values since it would break binary caching.
2832
set(SYSTEM_INCLUDEDIR "/usr/include")

ports/pkgconf/vcpkg.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "pkgconf",
33
"version": "2.5.1",
4+
"port-version": 1,
45
"description": "pkgconf is a program which helps to configure compiler and linker flags for development libraries. It is similar to pkg-config from freedesktop.org.",
56
"homepage": "https://github.com/pkgconf/pkgconf",
67
"license": null,

versions/baseline.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7402,7 +7402,7 @@
74027402
},
74037403
"pkgconf": {
74047404
"baseline": "2.5.1",
7405-
"port-version": 0
7405+
"port-version": 1
74067406
},
74077407
"plasma-wayland-protocols": {
74087408
"baseline": "1.14.0",

versions/p-/pkgconf.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"versions": [
3+
{
4+
"git-tree": "5ccb7c0a5bbbf338f36d8854f1cb8b0f2f3317da",
5+
"version": "2.5.1",
6+
"port-version": 1
7+
},
38
{
49
"git-tree": "39d1d31a02b57fa9e187f182ec32639984cc59cb",
510
"version": "2.5.1",

0 commit comments

Comments
 (0)