diff options
| author | Todor Prokopov <koprok@users.noreply.github.com> | 2019-03-01 08:58:46 +0200 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2019-02-28 22:58:46 -0800 |
| commit | 1afa2b0f7ba4079ff1bb1dd7724733b0cfc583d2 (patch) | |
| tree | 0af0b26a45608a5ccf3ce20a0ab44bf7afb0aba3 /ports/glib | |
| parent | 590f3a78b2d64ef1beb71129feca3db24c710a25 (diff) | |
| download | vcpkg-1afa2b0f7ba4079ff1bb1dd7724733b0cfc583d2.tar.gz vcpkg-1afa2b0f7ba4079ff1bb1dd7724733b0cfc583d2.zip | |
Build glib on x86-linux (#5313)
* Build glib on x86-linux
* [libffi] Code cleanup
* [glib] Use CMAKE_CXX_FLAGS instead of VCPKG_CXX_FLAGS
* [libffi] Use ${TARGET} in conditions
Diffstat (limited to 'ports/glib')
| -rw-r--r-- | ports/glib/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | ports/glib/CONTROL | 2 | ||||
| -rw-r--r-- | ports/glib/portfile.cmake | 11 |
3 files changed, 22 insertions, 9 deletions
diff --git a/ports/glib/CMakeLists.txt b/ports/glib/CMakeLists.txt index debfd8dd5..6e9e62a4f 100644 --- a/ports/glib/CMakeLists.txt +++ b/ports/glib/CMakeLists.txt @@ -71,13 +71,25 @@ else() set(ENV{MSGFMT} "/bin/echo") set(ENV{GMSGFMT} "/bin/echo") if(NOT EXISTS "${CMAKE_BINARY_DIR}/config/config.h") + string(TOUPPER UPPER_CONFIG "${CMAKE_BUILD_TYPE}") + set(CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${UPPER_CONFIG}} -I${PCRE_INCLUDE_DIR}") + set(CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${UPPER_CONFIG}} -I${PCRE_INCLUDE_DIR}") + if(BUILD_SHARED_LIBS) + set(LDFLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS_${UPPER_CONFIG}} -L${LIB_DIR}") + else() + set(LDFLAGS "${CMAKE_STATIC_LINKER_FLAGS} ${CMAKE_STATIC_LINKER_FLAGS_${UPPER_CONFIG}} -L${LIB_DIR}") + endif() + + string(STRIP "${CXXFLAGS}" CXXFLAGS) + string(STRIP "${CFLAGS}" CFLAGS) + string(STRIP "${LDFLAGS}" LDFLAGS) execute_process( COMMAND "${CMAKE_SOURCE_DIR}/configure" --disable-libelf --disable-libmount - "CPPFLAGS=-I${PCRE_INCLUDE_DIR}" - "CFLAGS=-I${PCRE_INCLUDE_DIR}" - "LDFLAGS=-L${LIB_DIR}" + "CPPFLAGS=${CXXFLAGS}" + "CFLAGS=${CFLAGS}" + "LDFLAGS=${LDFLAGS}" WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/config RESULT_VARIABLE res ) diff --git a/ports/glib/CONTROL b/ports/glib/CONTROL index 0e04397f8..7d5b3857b 100644 --- a/ports/glib/CONTROL +++ b/ports/glib/CONTROL @@ -1,4 +1,4 @@ Source: glib -Version: 2.52.3-11 +Version: 2.52.3-13 Description: Portable, general-purpose utility library. Build-Depends: zlib, pcre, libffi, gettext, libiconv diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index 96baa9b3e..b1ffc863d 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -16,17 +16,18 @@ endif() include(vcpkg_common_functions) set(GLIB_VERSION 2.52.3) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/glib-${GLIB_VERSION}) vcpkg_download_distfile(ARCHIVE URLS "https://ftp.gnome.org/pub/gnome/sources/glib/2.52/glib-${GLIB_VERSION}.tar.xz" FILENAME "glib-${GLIB_VERSION}.tar.xz" SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017) -vcpkg_extract_source_archive(${ARCHIVE}) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${GLIB_VERSION} PATCHES - ${CMAKE_CURRENT_LIST_DIR}/use-libiconv-on-windows.patch) + use-libiconv-on-windows.patch +) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/cmake DESTINATION ${SOURCE_PATH}) |