diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-05-21 19:46:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-21 10:46:07 -0700 |
| commit | 27c6c9420277c533cc4333bdd880f9862012cb72 (patch) | |
| tree | ffb9a979edc97e987ebca77590400e3577b93567 /ports/libb2 | |
| parent | f6dd5aee5b2ed144a8313a92290771947028e5b6 (diff) | |
| download | vcpkg-27c6c9420277c533cc4333bdd880f9862012cb72.tar.gz vcpkg-27c6c9420277c533cc4333bdd880f9862012cb72.zip | |
[vcpkg] Improve make builds (#10402)
* update all 16 configure_make ports
* add make wrappers for msvc
* improve make builds
* fix relativ path errors on linux (and osx?)
* revisit all 16 portfiles again
* remove trace from install
* fix relative build path issues.
* bump control of the 16 configure ports
* never forget .... real linux is case sensitive ....
* Revert "bump control of the 16 configure ports"
This reverts commit 40d6d81c01d2709c4acbdbec503b4787c3fd8282.
* Revert "Revert "bump control of the 16 configure ports""
This reverts commit 9c9851ddfcd01bfad604ab9c9aed7379238d619a.
* bump control again for real ci rebuild
* add copy_source
* remove message
* pass parameters to vcpkg_build_make
* fix healpix build.
* fix libmagic regression
* fix libwandio regression
* pfring changes regression fix? (cannot test in wsl)
* ws change to retrigger CI
* fix libpq regression
* fix libudns regression
* add share/pkgconfig to PKG_CONFIG_PATH
* cleanup of deprecated options
* cleanup docs
* Revert "bump control again for real ci rebuild"
This reverts commit b4bc18edc2376eba6c3aa3dda52bd82286f23616.
* shared binaries on linux should stay in lib. Only dlls are mvoed to bin
* move pkgconfig check and add message about missing system packages
* added autopoint as a build requirement
* fix prerun shell working dir.
* a few fixes from the x windows pr
- add libpath setting
- fixed pkgconfig search on windows platforms
- fixed autopoint msys package on windows
* fix release prefix
* minimal cleanup and ws changes to trigger true CI rebuild
* fix tcl by upgrading
* remove unnecessary rename
* fix pfring? can't test in WSL. Linux kernel headers required.
* fix lowercase in patch
* fix libwandio
* remove x264 from fail list
* replace wrappers with wrappers from automake
* update make ports
* remove unnecessary message
* refactor vcpkg_configure_make
* [tcl] remove stray ?
* [farmhash] fix build
* [freexl] ws change to retrigger ci build
* [x264] add pthread as a dependency
* [vcpkg/scripts] add ignore flag correctly
* [sdl] fix vcpkg_fixup_pkgconfig call
* [farmhash/freexl] delete configure and recreate it.
* [libudns] remove trailing ?
* [freexl] use empty build target
* [freexl] add system library; remove previous change
* Update ports/x264/portfile.cmake
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* [libwandio] remove unncessary comment
Co-authored-by: dan-shaw <51385773+dan-shaw@users.noreply.github.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Diffstat (limited to 'ports/libb2')
| -rw-r--r-- | ports/libb2/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libb2/portfile.cmake | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/ports/libb2/CONTROL b/ports/libb2/CONTROL index 0523b60d5..41fb105aa 100644 --- a/ports/libb2/CONTROL +++ b/ports/libb2/CONTROL @@ -1,4 +1,4 @@ Source: libb2 -Version: 0.98.1 +Version: 0.98.1-1 Homepage: https://github.com/BLAKE2/libb2 Description: C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp
\ No newline at end of file diff --git a/ports/libb2/portfile.cmake b/ports/libb2/portfile.cmake index 88007bdf0..2a342f9dc 100644 --- a/ports/libb2/portfile.cmake +++ b/ports/libb2/portfile.cmake @@ -1,5 +1,3 @@ -vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux platform" ON_TARGET "Windows" "OSX") - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO BLAKE2/libb2 @@ -8,12 +6,18 @@ vcpkg_from_github( HEAD_REF master ) +set(OPTIONS) +if(CMAKE_HOST_WIN32) + set(OPTIONS --disable-native) # requires cpuid +endif() + vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} - AUTOCONFIG + OPTIONS ${OPTIONS} ) - vcpkg_install_make() +vcpkg_fixup_pkgconfig() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) |
