Skip to content

[fontconfig] Fix cross-compile on x64-osx for arm64-osx #23418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kafeg wants to merge 5 commits into from
Closed

[fontconfig] Fix cross-compile on x64-osx for arm64-osx #23418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fe07544
[fontconfig] Fix cross-compile on x64-osx for arm64-osx
kafeg Mar 7, 2022
973f119
Fix formatting
kafeg Mar 7, 2022
f23cd15
Fix formatting
kafeg Mar 7, 2022
43f4347
Update version database
kafeg Mar 7, 2022
3e0dd53
Update ports/fontconfig/portfile.cmake
kafeg Mar 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions ports/fontconfig/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,12 @@ file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share
if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_CROSSCOMPILING)
set(ENV{FONTCONFIG_PATH} "${CURRENT_PACKAGES_DIR}/etc/fonts")
set(ENV{FONTCONFIG_FILE} "${CURRENT_PACKAGES_DIR}/etc/fonts/fonts.conf")
vcpkg_execute_required_process(COMMAND "${CURRENT_PACKAGES_DIR}/bin/fc-cache${VCPKG_TARGET_EXECUTABLE_SUFFIX}" --verbose
WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin"

# When build on x64-osx host for arm64-osx target, VCPKG_CROSSCOMPILING is not set
set(TOOLS_DIR "${CURRENT_HOST_INSTALLED_DIR}/tools/fontconfig")

vcpkg_execute_required_process(COMMAND "${TOOLS_DIR}/bin/fc-cache${VCPKG_TARGET_EXECUTABLE_SUFFIX}" --verbose
WORKING_DIRECTORY "${TOOLS_DIR}/bin"
LOGNAME fc-cache-${TARGET_TRIPLET})
endif()

Expand Down
7 changes: 6 additions & 1 deletion ports/fontconfig/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
{
"name": "fontconfig",
"version": "2.13.94",
"port-version": 5,
"port-version": 6,
"description": "Library for configuring and customizing font access.",
"homepage": "https://www.freedesktop.org/wiki/Software/fontconfig",
"dependencies": [
"dirent",
"expat",
{
"name": "fontconfig",
"host": true,
"platform": "osx"
},
"freetype",
"gettext",
"json-c",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2242,7 +2242,7 @@
},
"fontconfig": {
"baseline": "2.13.94",
"port-version": 5
"port-version": 6
},
"foonathan-memory": {
"baseline": "2019-07-21",
Expand Down
5 changes: 5 additions & 0 deletions versions/f-/fontconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8ca1394bfb75ef425ddc306f82915db9485cc01d",
"version": "2.13.94",
"port-version": 6
},
{
"git-tree": "2f32046747209c234e60dc297b48d5bdc7ee4494",
"version": "2.13.94",
Expand Down