mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 20:25:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[luajit] Fix cross compile for macOS (#29003)

Browse Source 
* [luajit] Bump version and fix cross compile for macOS

* update version database
This commit is contained in:
xiaozhuai, Weihang Ding 2023-01-27 11:30:21 +08:00 committed by GitHub
parent 0bf1ec683e
commit 60eff91cc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ports/luajit/portfile.cmake
View File

@ -7,8 +7,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO LuaJIT/LuaJIT
REF 46aa45dcbd9f3843503ddf3e00f8dda89eac6789 #2022-11-22
SHA512 da369f3145ed3b85948e0095ba3dd720da10dcedf9a9b301efe7a035d59ce291bc286f8fa88f2073d4aea12f9cae43ae64152d1062b6f4df562bd3d914c8619d
REF d0e88930ddde28ff662503f9f20facf34f7265aa #2023-01-04
SHA512 e4111b2d7eeb05676c62d69da13a380a51d98f082c0be575a414c09ee27ff17d101b5b4a95e1b8a1bad14d55a4d2b305718a11878fbf36e0d3d48e62ba03407f
HEAD_REF master
PATCHES
003-do-not-set-macosx-deployment-target.patch
@ -24,6 +24,16 @@ else()
set (LJIT_MSVC_PC_CFLAGS "")
endif()
if(VCPKG_TARGET_IS_OSX)
set(MACOSX_DEPLOYMENT_TARGET "MACOSX_DEPLOYMENT_TARGET=${VCPKG_OSX_DEPLOYMENT_TARGET}")
set(TARGET_ARCHITECTURE "${VCPKG_TARGET_ARCHITECTURE}")
if(TARGET_ARCHITECTURE STREQUAL x64)
set(TARGET_ARCHITECTURE x86_64)
endif()
list(APPEND MACOSX_ARCHITECTURES "TARGET_CFLAGS=--target=${TARGET_ARCHITECTURE}-apple-darwin")
list(APPEND MACOSX_ARCHITECTURES "TARGET_LDFLAGS=--target=${TARGET_ARCHITECTURE}-apple-darwin")
endif()
if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug)
message(STATUS "Building ${TARGET_TRIPLET}-dbg")
file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
@ -52,14 +62,13 @@ if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug)
endif()
vcpkg_copy_pdbs()
else()
set(MACOSX_DEPLOYMENT_TARGET "MACOSX_DEPLOYMENT_TARGET=${VCPKG_OSX_DEPLOYMENT_TARGET}")
vcpkg_execute_build_process(
COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile clean
COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile ${MACOSX_DEPLOYMENT_TARGET} clean
WORKING_DIRECTORY ${SOURCE_PATH}
LOGNAME clean-${TARGET_TRIPLET}-debug
)
vcpkg_execute_build_process(
COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile ${MACOSX_DEPLOYMENT_TARGET} PREFIX=${CURRENT_PACKAGES_DIR}/debug CCDEBUG=-g3 CFLAGS=-O0 BUILDMODE=${VCPKG_LIBRARY_LINKAGE} install
COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile ${MACOSX_DEPLOYMENT_TARGET} ${MACOSX_ARCHITECTURES} PREFIX=${CURRENT_PACKAGES_DIR}/debug CCDEBUG=-g3 CFLAGS=-O0 BUILDMODE=${VCPKG_LIBRARY_LINKAGE} install
WORKING_DIRECTORY ${SOURCE_PATH}
LOGNAME build-${TARGET_TRIPLET}-debug
)
@ -95,14 +104,13 @@ if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release)
endif()
vcpkg_copy_pdbs()
else()
set(MACOSX_DEPLOYMENT_TARGET "MACOSX_DEPLOYMENT_TARGET=${VCPKG_OSX_DEPLOYMENT_TARGET}")
vcpkg_execute_build_process(
COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile clean
COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile ${MACOSX_DEPLOYMENT_TARGET} clean
WORKING_DIRECTORY ${SOURCE_PATH}
LOGNAME clean-${TARGET_TRIPLET}-rel
)
vcpkg_execute_build_process(
COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile ${MACOSX_DEPLOYMENT_TARGET} PREFIX=${CURRENT_PACKAGES_DIR} CCDEBUG= BUILDMODE=${VCPKG_LIBRARY_LINKAGE} install
COMMAND make -j${VCPKG_CONCURRENCY} -f ${SOURCE_PATH}/Makefile ${MACOSX_DEPLOYMENT_TARGET} ${MACOSX_ARCHITECTURES} PREFIX=${CURRENT_PACKAGES_DIR} CCDEBUG= BUILDMODE=${VCPKG_LIBRARY_LINKAGE} install
WORKING_DIRECTORY ${SOURCE_PATH}
LOGNAME build-${TARGET_TRIPLET}-rel
)

2
ports/luajit/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "luajit",
"version-date": "2022-11-22",
"version-date": "2023-01-04",
"description": "LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language.",
"homepage": "https://github.com/LuaJIT/LuaJIT",
"license": "MIT",

2
versions/baseline.json
View File

@ -4737,7 +4737,7 @@
"port-version": 2
},
"luajit": {
"baseline": "2022-11-22",
"baseline": "2023-01-04",
"port-version": 0
},
"luasec": {

5
versions/l-/luajit.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3c7f639efd41b49e93c61ae54fd99bb332d80bf9",
"version-date": "2023-01-04",
"port-version": 0
},
{
"git-tree": "6008fc1c5042466dab836694887b8795471b64fb",
"version-date": "2022-11-22",