diff options
| author | kwiechen <kwiechen1@gmail.com> | 2021-04-09 18:57:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-09 09:57:32 -0700 |
| commit | 326425d8ff199fbefd8be640578ba3c517f00920 (patch) | |
| tree | 2914bda8d04e989e7934f4bf1982102287c7ce0c | |
| parent | c739e82beccbdc3ac63c6e1ec486445cbcb9a018 (diff) | |
| download | vcpkg-326425d8ff199fbefd8be640578ba3c517f00920.tar.gz vcpkg-326425d8ff199fbefd8be640578ba3c517f00920.zip | |
[glib] fix build error for x64-linux-dynamic (#17117)
* [cairo] Add pkgconfig file
* [cairo] Add pkgconfig file
| -rw-r--r-- | ports/glib/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ports/glib/CONTROL | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/g-/glib.json | 5 |
4 files changed, 8 insertions, 3 deletions
diff --git a/ports/glib/CMakeLists.txt b/ports/glib/CMakeLists.txt index b0ee220aa..47ebf0f47 100644 --- a/ports/glib/CMakeLists.txt +++ b/ports/glib/CMakeLists.txt @@ -181,7 +181,7 @@ endif() # gmodule add_library(gmodule gmodule/gmodule.c) target_compile_definitions(gmodule PRIVATE G_LOG_DOMAIN="GModule") -target_link_libraries(gmodule PRIVATE glib ${Intl_LIBRARIES}) +target_link_libraries(gmodule PRIVATE glib ${CMAKE_DL_LIBS} ${Intl_LIBRARIES}) target_include_directories(gmodule PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/gmodule>) target_include_directories(gmodule PRIVATE ${Intl_INCLUDE_DIRS} PUBLIC $<INSTALL_INTERFACE:include>) list(APPEND GLIB_TARGETS gmodule) diff --git a/ports/glib/CONTROL b/ports/glib/CONTROL index 48501faaa..915deccd5 100644 --- a/ports/glib/CONTROL +++ b/ports/glib/CONTROL @@ -1,6 +1,6 @@ Source: glib Version: 2.52.3 -Port-Version: 25 +Port-Version: 26 Homepage: https://developer.gnome.org/glib/ Description: Portable, general-purpose utility library. Build-Depends: zlib, pcre, libffi, gettext, libiconv diff --git a/versions/baseline.json b/versions/baseline.json index e11e62c7d..318f4e695 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2250,7 +2250,7 @@ }, "glib": { "baseline": "2.52.3", - "port-version": 25 + "port-version": 26 }, "glibmm": { "baseline": "2.52.1", diff --git a/versions/g-/glib.json b/versions/g-/glib.json index 9cfd59ea0..05b4ab39f 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "4ae9d07c61fa6787bacd9402f61b416843e36867", + "version-string": "2.52.3", + "port-version": 26 + }, + { "git-tree": "5cadd8fd83d64bc11b551994268c796eabf629b6", "version-string": "2.52.3", "port-version": 25 |