diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-04-06 23:43:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-06 14:43:16 -0700 |
| commit | bd0c7106f95d7a72c247441e2fbec39e7716ecaa (patch) | |
| tree | b4140f7ee25fe069de5e22a179d51f8b6f9d068c /ports | |
| parent | 52b5dfd2efbc576a3073fe335e7694f5d4d4c143 (diff) | |
| download | vcpkg-bd0c7106f95d7a72c247441e2fbec39e7716ecaa.tar.gz vcpkg-bd0c7106f95d7a72c247441e2fbec39e7716ecaa.zip | |
[vcpkg] Make configure meson sane and work for all targets. (#10395)
* fix configure meson for non windows builds.
* change to the two ports using meson
* fix passing of empty compiler arguments.
* dont transform / into - for all flags
* copy meson logs into the buildtree to better diagnose CI errors of meson ports
* another change to the two ports to actually force a CI rebuild
* add missing /pkgconfig dir to PKG_CONFIG_PATH
* fix pkgconfig setup
* add share/pkgconfig to PKG_CONFIG_PATH
* Add CMake path to PATH for meson
* add share folder to prefix for meson
* remove double message
* add libdir so that meson does not install into architecture folder in linux
and make prefix path target dependent. (Or should it be host dependent?)
* bump controls
* update toolchain selector to use VCPKG_TARGET_IS_<paltform>.
* change pkgconfig prefix and path.....
meson is not correctly handling native windows paths and eating "\"
PKG_CONFIG_PATH also nees : to correctly separate paths
Prefix still must be near to native path but with / instead of \ C:/somepath/
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/fribidi/CONTROL | 2 | ||||
| -rw-r--r-- | ports/fribidi/portfile.cmake | 4 | ||||
| -rw-r--r-- | ports/libepoxy/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libepoxy/portfile.cmake | 6 |
4 files changed, 5 insertions, 9 deletions
diff --git a/ports/fribidi/CONTROL b/ports/fribidi/CONTROL index 771c4716e..6db23d6f9 100644 --- a/ports/fribidi/CONTROL +++ b/ports/fribidi/CONTROL @@ -1,4 +1,4 @@ Source: fribidi
-Version: 2019-02-04-2
+Version: 2019-02-04-3
Description: GNU FriBidi is an implementation of the Unicode Bidirectional Algorithm (bidi)
Build-Depends: tool-meson
diff --git a/ports/fribidi/portfile.cmake b/ports/fribidi/portfile.cmake index 843964500..79edb65c4 100644 --- a/ports/fribidi/portfile.cmake +++ b/ports/fribidi/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO fribidi/fribidi
@@ -32,4 +30,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) endif()
# Handle copyright
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/fribidi RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/libepoxy/CONTROL b/ports/libepoxy/CONTROL index f19def943..2ff219a8f 100644 --- a/ports/libepoxy/CONTROL +++ b/ports/libepoxy/CONTROL @@ -1,5 +1,5 @@ Source: libepoxy
-Version: 1.5.3-2
+Version: 1.5.3-3
Homepage: https://github.com/anholt/libepoxy
Description: Epoxy is a library for handling OpenGL function pointer management for you
Build-Depends: tool-meson
diff --git a/ports/libepoxy/portfile.cmake b/ports/libepoxy/portfile.cmake index 50f3fa55f..e578dd659 100644 --- a/ports/libepoxy/portfile.cmake +++ b/ports/libepoxy/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( @@ -72,5 +70,5 @@ endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/pkgconfig) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig) -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libepoxy) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/libepoxy/COPYING ${CURRENT_PACKAGES_DIR}/share/libepoxy/copyright) +file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) |