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/freexl | |
| 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/freexl')
| -rw-r--r-- | ports/freexl/CONTROL | 2 | ||||
| -rw-r--r-- | ports/freexl/portfile.cmake | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/ports/freexl/CONTROL b/ports/freexl/CONTROL index 23f6b3468..68d0d291f 100644 --- a/ports/freexl/CONTROL +++ b/ports/freexl/CONTROL @@ -1,5 +1,5 @@ Source: freexl -Version: 1.0.4-8 +Version: 1.0.4-9 Homepage: https://www.gaia-gis.it/gaia-sins/freexl-sources Description: FreeXL is an open source library to extract valid data from within an Excel (.xls) spreadsheet Build-Depends: libiconv diff --git a/ports/freexl/portfile.cmake b/ports/freexl/portfile.cmake index 825378837..3c4629dce 100644 --- a/ports/freexl/portfile.cmake +++ b/ports/freexl/portfile.cmake @@ -1,4 +1,3 @@ -include(vcpkg_common_functions) set(FREEXL_VERSION_STR "1.0.4") vcpkg_download_distfile(ARCHIVE @@ -36,8 +35,7 @@ if (VCPKG_TARGET_IS_WINDOWS) INSTALLED_ROOT="${CURRENT_INSTALLED_DIR}" INST_DIR="${CURRENT_PACKAGES_DIR}" "LINK_FLAGS=" - "LIBS_ALL=${LIBS_ALL_REL}" - + "LIBS_ALL=${LIBS_ALL_REL}" ) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/freexl RENAME copyright) @@ -64,7 +62,7 @@ elseif (CMAKE_HOST_UNIX OR CMAKE_HOST_APPLE) # Build in UNIX ARCHIVE ${ARCHIVE} OUT_SOURCE_PATH SOURCE_PATH ) - + file(REMOVE_RECURSE "${SOURCE_PATH}/configure") vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} OPTIONS_DEBUG @@ -80,6 +78,7 @@ elseif (CMAKE_HOST_UNIX OR CMAKE_HOST_APPLE) # Build in UNIX ) vcpkg_install_make() + vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES m) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/freexl RENAME copyright) |
