Skip to content

[vcpkg baseline] Fix pbc build failure with x64-osx #12732

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

Merged
strega-nil merged 6 commits into from
Aug 4, 2020
Merged

[vcpkg baseline] Fix pbc build failure with x64-osx #12732

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
da215f7
[pbc] test in ci
PhoebeHui Aug 4, 2020
ed2c7e0
Add depends port gmp
PhoebeHui Aug 4, 2020
3afaf77
Add dependency port gmp
PhoebeHui Aug 4, 2020
1f0822d
Update ports/pbc/CONTROL
PhoebeHui Aug 4, 2020
aa687c9
Build with make instead
PhoebeHui Aug 4, 2020
33a6ad1
Merge branch 'dev/Phoebe/pbc' of https://github.com/PhoebeHui/vcpkg i…
PhoebeHui Aug 4, 2020
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
5 changes: 3 additions & 2 deletions ports/pbc/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
Source: pbc
Version: 0.5.14-2
Build-Depends: mpir (windows)
Version: 0.5.14
Port-Version: 3
Build-Depends: mpir (windows), gmp(osx)
Comment thread
PhoebeHui marked this conversation as resolved.
Outdated
Homepage: https://crypto.stanford.edu/pbc
Description: Pairing-Based Crypto library provides low-level routines for pairing-based cryptosystems.
Supports: !uwp
16 changes: 12 additions & 4 deletions ports/pbc/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@ if(VCPKG_CMAKE_SYSTEM_NAME)
PATCHES linux.patch
)

find_path(GMP_INCLUDE_DIR "gmp.h" HINTS ${CURRENT_INSTALLED_DIR} PATH_SUFFIXES include)

find_library(GMP_LIBRARIES_DBG NAMES "libgmp" HINTS ${CURRENT_INSTALLED_DIR} PATH_SUFFIXES debug/lib)
get_filename_component(GMP_LIBRARIES_DBG ${GMP_LIBRARIES_DBG} DIRECTORY)

find_library(GMP_LIBRARIES_REL NAMES "libgmp" HINTS ${CURRENT_INSTALLED_DIR} PATH_SUFFIXES lib)
get_filename_component(GMP_LIBRARIES_REL ${GMP_LIBRARIES_REL} DIRECTORY)

vcpkg_find_acquire_program(BISON)
vcpkg_find_acquire_program(FLEX)

Expand All @@ -36,8 +44,8 @@ if(VCPKG_CMAKE_SYSTEM_NAME)
file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)
message(STATUS "Configuring ${TARGET_TRIPLET}-dbg")
set(ENV{CFLAGS} "${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_DEBUG} -O0 -g -I${SOURCE_PATH}/include")
set(ENV{LDFLAGS} "${VCPKG_LINKER_FLAGS}")
set(ENV{CFLAGS} "${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_DEBUG} -O0 -g -I${SOURCE_PATH}/include -I${GMP_INCLUDE_DIR}")
set(ENV{LDFLAGS} "${VCPKG_LINKER_FLAGS} -L${GMP_LIBRARIES_DBG}")
vcpkg_execute_required_process(
COMMAND ${SOURCE_PATH}/configure --prefix=${CURRENT_PACKAGES_DIR}/debug ${OPTIONS} --with-sysroot=${CURRENT_INSTALLED_DIR}/debug
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
Expand All @@ -53,8 +61,8 @@ if(VCPKG_CMAKE_SYSTEM_NAME)
file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
message(STATUS "Configuring ${TARGET_TRIPLET}-rel")
set(ENV{CFLAGS} "${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_RELEASE} -O3 -I${SOURCE_PATH}/include")
set(ENV{LDFLAGS} "${VCPKG_LINKER_FLAGS}")
set(ENV{CFLAGS} "${VCPKG_C_FLAGS} ${VCPKG_C_FLAGS_RELEASE} -O3 -I${SOURCE_PATH}/include -I${GMP_INCLUDE_DIR}")
set(ENV{LDFLAGS} "${VCPKG_LINKER_FLAGS} -L${GMP_LIBRARIES_REL}")
vcpkg_execute_required_process(
COMMAND ${SOURCE_PATH}/configure --prefix=${CURRENT_PACKAGES_DIR} ${OPTIONS} --with-sysroot=${CURRENT_INSTALLED_DIR}
WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
Expand Down