- Use appropriate EXECUTABLE_SUFFIX to support non-Windows platforms
- Fixup `curl-target-release.cmake` to point to the new executable location (fixing the CURL::curl target)
* OpenTracing #5970
* No UWP. Static requires dynamic #5970
- Dynamic version can be build without the static one
- Static version can only be build when dynamic is also active
- UWP is not supported
* Linux support #5970
* limit windows dep libs to windows
* fixing configure patch
* fixing detect-openssl.patch
* adapting portfile to linux
* adding a linux-specific build sh
* add missing endif()
* bumping version
* adding extra check for windows environment
* Using newer version of ITK which fixes double-conversion problem
* Minor style update of ITK portfile
* Using newer version of ITK which fixes double-conversion problem
* [itk] Improve version string
* [itk][hdf5] Update ITK commit. Depend on eigen3. Bump hdf5 control version.
* [hdf5] Update CONTROL
* [netcdf-c] Disable parallel configure due to writes to source directory
* [hdf5] Disable parallel configure due to writes to source directory. Switch to tar.gz to prevent CRLF line endings.
Abseil now has all uses of min and max wrapped in parens to prevent macro expansion. This will continue to be the case going forward, so these replacements are no longer needed.
Also, the Github web UI is forcing an extra change that updates the return character to the proper Windows CR+LF
* [jemalloc]Fix dll generated when generating static library
* Revert "[jemalloc]Fix dll generated when generating static library"
This reverts commit a833bf5593.
* [abseil]Fix link error when using abseil library.
* [giflib]fix compile error in x64-uwp
* [giflib]Modify the location of the CMakelists.txt changes in the patch to avoid patching failures.
* [giflib]Modify cmakelists.txt directly and delete the corresponding changes in the patch
* [giflib] Modernize. Avoid use of WINDOWS_EXPORT_ALL_SYMBOLS.
Abseil now has all uses of min and max wrapped in parens to prevent macro expansion. This will continue to be the case going forward, so these replacements are no longer needed.
Also, the Github web UI is forcing an extra change that updates the return character to the proper Windows CR+LF
* [jemalloc]Fix dll generated when generating static library
* Revert "[jemalloc]Fix dll generated when generating static library"
This reverts commit a833bf5593.
* [mozjpeg]1.Fix installation files to the wrong directory. 2.Change how dynamic and static library built macros are used
* [qt5-macextras] Add qt5-macextras port
* [cutelyst2] Fix install on mac
* [qt5-purchasing] Add missing dependency on qt5-declarative
* [qt5] Ensure we link to required libraries for qt5 static build
* [qscintilla] Fix install on mac
* [libqglviewer] Fix install paths on mac
* [libqglviewer] Fix regressions
* [qscintilla] Fix regressions
* Bump version numbers
* [qt5] restore harfbuzz on osx
* [ace] Add support for vcpkg install ace on Linux
* ports/ace/CONTROL:
* ports/ace/portfile.cmake:
* Fix mwc logfile name
* ports/ace/portfile.cmake:
* Fixed windows detection
* ports/ace/portfile.cmake:
* [qt5-modularscripts] Split build steps
When building modules not available from the vendor download side, the
build process stays the same. Create two functions, one for accessing
the sources, the other for compilation.
* [qtmqtt] Add new port (#5736)
* [ismrmrd] make optional hdf5 dependency explicit
This port will behave differently in the CI build depending on if hdf5 was installed
before it. Make the hdf5 dependency explicit so it will behave consistently.
* [rapidxml-ns] Add new port
* [rapidxml] Move headers out of include to prevent conflicts and clutter.
* [rapidxml-ns] Update SHA512
* [rapidxml-ns] Fix header installation
* [3fd] Fix header issue with rapidxml
* [qcustomplot] Add new port
* [qt5-base] Trigger a rebuild for qcustomplot
* Revert "[qt5-base] Trigger a rebuild for qcustomplot"
This reverts commit 1082892d12.
* [qcustomplot] Trigger rebuild on CI
* Update Capstone to v4.0.1-49-ge3d5a594
* Use full SHA hash for ref
* Build Capstone with dynamic runtime
* Update Capstone to 4.0.1-57-g120373dc
* Fix wrong description for osxkernel feature
* * [libcds] Update to v2.3.3 (#5274)
* Minimum CMake version is 3.0.2
* Changed software license from BSD to Boost
* Removed '#pragma lib' for Windows build
* Bugfix and minor improvements
* [libcds] Use PATCHES parameter instead of `vcpkg_apply_patches()`
* [libcds] Fix static builds
* fix find_package for fftw3
* the patch took care of moving the files
* Additional Patch to add Suffix to LibraryDepends
* fixed minsizerel and relwithdebinfo for vs cmake configs
* remove fix for minsizerel and relwithdeb info. Use global cmake mappings of these targets instead!
* added feature packages. unfortunally avx and avx2 create an ICE with Visual Studio 2017 (maybe fixed with 2019?)
* removed sse2 as default (forgot about arm...)
* [qt5] Fix mac build
* [qt5] Disable parallel build on mac
* [qt5] Fix qmake find on mac
* [qt5] Update find jom for mac
* [qt5] Fix invocation of build command
* [qt5-base] Rebuild packages for #5624
* [harfbuzz] Remove disabled assert (failing due to -Werror)
* [qt5] Bump control version
* [qt5] Disable harfbuzz on mac
* [qt5-base] Disable harfbuzz on mac
* Replicating generation command in Linux format
Current port only support Windows. Replicating the commands that generate "std.jsonnet.h" for a Linux build. New command is closer to the original at https://github.com/google/jsonnet/blob/master/Makefile#L162
* [jsonnet] bump control version to force rebuild on update
* Update to install CGAL as header-only
I think the issue #2471 would be completely solved, if vcpkg installed CGAL as header-only. That way, the installed `CGALConfig.cmake` would search for its dependencies, instead of hard-coding their path in the file.
* Bump the version
* Fix the cleaning
Once CGAL is header-only, no binary library is created, and the
`debug/` directory got empty.
This commit fixes the cleaning: now the whole `debug/` directory is
removed.
* Fixes broken dependencies between ITK and VTK
restore a line of ed9357a overrided by aa560f1fixes#5614
* [itk] Fixes broken dependencies between ITK and VTK
* [sdl2-gfx] Update to 1.0.4
* [sdl2-mixer] Update to 2.0.4 (#4934)
* [sdl2-image] Update to 2.0.4
* [sdl2-ttf] Update to 2.0.15
* [sdl2-gfx,-image,-ttf] Use vcpkg_extract_source_archive_ex()
* Microsoft Angle now builds for UWP
* Updates to files
* Fix for Control Flow Guard
* Now fails for OSX and Linux, also includes support for ARM64
* Fix for ARM64-WINDOWS
In this version we can remove the dependency on gtest for the build. Of
course there are many other changes, but that is the one relevant for
packaging.
* [nmap] Integration of nmap netwotk utilities(#5530)
* [nmap] adding openssl and openssh2 support
* [nmap] Integration of nmap netwotk utilities(#5530)
* [nmap] correction of the DIR option with-openssl
and with-openssh
* [poco] pre 2.0.0
- Updated to the latest compiling commit
- Added SQLite support
- Added PDF support
- Added MariaDB support
- Added PostgreSQL support
* Additional include files not part of any libraries
* DataException is no more part of Poco::Data
* [3fd] Patch 3fd to comply with poco-2.0.0pre
* Use our source only distribution and generate the necessary solution as part of the build
* ports/ace/portfile.cmake:
* Add ACE_ROOT
* ports/ace/portfile.cmake:
* Support static and generate within the ace directory
* ports/ace/portfile.cmake:
* Set missing environment
* ports/ace/portfile.cmake:
* Fixed install for static
* ports/ace/portfile.cmake:
* Also install pdb in a static job
* ports/ace/portfile.cmake:
* pdb files are only created in a dynamic build
* ports/ace/portfile.cmake:
* Add missing library
* ports/ace/portfile.cmake:
* Add missing header directory
* ports/ace/portfile.cmake:
* Use ACE_ROOT for the copyright file
* ports/ace/portfile.cmake:
* [ace] bump dash version in control to force rebuild
* [libff] Add new port
* Add new port [libbf]
* Update portfile.cmake
* update libbf portfile
* [libbf] Fail with meaningful message on Windows
* [libbf] Fix MSVC check condition
* Add qt5-activeqt library.
* qt5: Fix build failure due to empty output directories.
* [qt5-base] whitespace change to force clean test build in CI system
* [cppfs] Add new port
* [cppfs] Remove explicit libcrypto dependency
* [cppfs] Use vcpkg targets
* [cppfs] Don't use local find modules
* [cppfs] Disable arm64 and uwp
* [cppfs] Make portfile indentation consistent
* [hdf5] Use cmake wrapper to ensure consuming libraries link to szip in static build
* [hdf5] Move hdf5 cmake code from vcpkg.cmake to vcpkg-cmake-wrapper
* [hdf5] Do not force search in config mode
* [hdf5] balance needs of vtk and kealib
* Add patch file to make glslang known to pkg-config
* Proper patch file
* Fix paths in the patch file
* Add missing space so patch file can apply
* Remove debug/share directory
* Export everything to the glslangConfig
* Export the SPIRV target as well
* Remove not-working patch for main CMake file
* [glslang] Remove call to windows CRT changing function
* [glslang] Remove unnecessary calls to install inside patch
* [glslang] Check cmake imports correctly
* [Pthreads]Modify library name "pthreadsVC2" to correct name "pthreadVC2".
* [pthreads]update Version
* [flint]fix dependence port pthreads library name to "pthreadVC2".
* [usbmuxd]fix dependence port pthreads library name to "pthreadVC2".
* [mosquitto]fix dependence port pthreads library name to "pthreadVC2".
Remove empty directories and set correct cmake target path
Machine setup: ubuntu 18.10 x64 gcc version 8.2.0
The steps to reproduce: ./vcpkg install urdfdom:x64-linux
* [nanopb] Add new port
* [nanopb] Always use static linkage
* [nanopb] Update to 2019-02-12 and add shared lib building support
* [nanopb] Add missing patch file
* [nanopb] Copy pdb file
* [nanopb] Add some warnings
* some libraries export <PackageName>LibraryDepends.cmake
instead of <PackageName>Targets.cmake.
Those file also need the fix of #1044
should close#4753
* prefered the general solution #4622.
hopefully solved the issue within #4150
replaced the regex with something more readable
(also ident is lost)
should close:
#4753#4633#4150
and maybe more
* Hash vcpkg_fixup_cmake_targets.cmake
* [boost] Fix use of find_package(Boost) with cache variables
[socket-io-client] Fix install
* reversed change back to use regex replace
* [glbinding] Fix _IMPORT_PREFIX depth in *-export.cmake files
* [tinyspline] Ignore warnings treated as errors
* [libevent, liblemon, libpng, smpeg2, zlib] Fix apply patches
* [libsodium] Fix apply patches
* [folly] Link correct libraries in debug and release
* [vtk] Remove unset of _IMPORT_PREFIX
* [tinyspline] Do not treat warnings as errors
* [smpeg2] Fix double* to int comparison
* [nvtt] Define value for HAVE_UNISTD_H in MacOS
* [libui] Fix MacOS X build
* [zlib] Fix download URL
* [qhull] Update to v7.2.1
* [podofo] Set value for HAVE_UNISTD_H in MacOS
* [mongo-cxx-driver,ogre,podofo,qhull] Bump CONTROL version
* [mongo-c-driver] Set _IMPORT_PREFIX
* [tmxparser] Bump CONTROL version
* [qhull,vxl] Bump CONTROL version
* Update libmodplug to build on linux
* [libmodplug] Patch instead of changing downloading source
* [libmodplug] Keep original source instead of using fork
* [miniz] Add new port
* [miniz] Fix Windows Build Conflict
* [miniz] Miniz cannot be built as a shared library
* [miniz] Force miniz to be static library
* [miniz] Fix CRT deprecation error on uwp
* [miniz] Fix CRT deprecation error within tests
* [miniz] Disable tests entirely
* [libwebp] update to v1.0.2, greatly simplify port, remove unnecessary custom find_package script in favour of original Config files for cmake
* [libwebp] enable building of all tools
* [libwebp] install cmake config file in expected path
* [libwebp] add compatibility layer inside CMake Config file
* [libwebp] fix libwebpmux library name
* [OpenEXR] Update to v2.3.0, enable tools, improve cmake module while still maintaining backwards compatibility (there's an official one distributed with the package but it is completely different, for now it is avoided)
* [OpenEXR] remove unused patches
* [OpenEXR] remove forced definition, could hide problems downstream
* [freeimage] add compatibility with latest OpenEXR
* [freeimage] bump control
* [OpenEXR] restore ilmbase as an empty package to permit clean update
* [OpenVDB] update to v6.0
* [OpenEXR] disable building on UWP platform
* [openexr] Fix tools suffixes
* [openexr] Fix Linux build paths
* Add X-Plane SDK support
* fix: disallow x86 builds
The x-plane SDK website claims that the SDK is only
compatible with x64. The PR that adds support for this
fails in x86, so I'm disallow x86 builds to align with
the x-plane documentation.
* fix: install sdk headers to the root include path
The x-plane SDK website's examples expect that the sdk
headers are at the root of the include path. I'm adjusting
this port to align with those samples, as we want examples
to "just work" as much as possible.
* style: whitespace
* Remove ununsed directory
* Update qt5-base to 5.12.1
* update qt5-declarative to 5.12.1
* update qt5-modularscripts for 5.12.1
* update qt5-3d to 5.12.1
* update qt5-activeqt to 5.12.1
* add qt5-connectivity
* update qt5-charts to 5.12.1
* update qt5-datavis3d to 5.12.1
* update qt5-gamepad to 5.12.1
* update qt5-graphicaleffects to 5.12.1
* update qt5-imageformats to 5.12.1
* add qt5-location
* update qt5-multimedia to 5.12.1
* update qt5-networkauth to 5.12.1
* add qt5-purchasing
* update qt5-quickcontrols to 5.12.1
* update qt5-quickcontrols2 to 5.12.1
* add qt5-remoteobjects
* update qt5-script to 5.12.1
* update qt5-scxml to 5.12.1
* add qt5-sensors
* update qt5-serialport to 5.12.1
* update qt5-speech to 5.12.1
* update qt5-svg to 5.12.1
* update qt5-tools to 5.12.1
* update qt5-virtualkeyboard to 5.12.1
* add qt5-webchannel
* update qt5-websockets to 5.12.1
* update qt5-winextras to 5.12.1
* update qt5-xmlpatterns to 5.12.1
* update framework port to 5.12.1 and include the new modules
* fix building qt5-base on linux
* [qt5] Remove non-alphanumerical ASCII chars from dependencies
* [mlpack] Add new port
Add new port for the http://www.mlpack.org/ library
* Tools optional and static build
* Info fix
* [mlpack] Use PATCHES parameter instead of apply_patches()
* Add X-Plane SDK support
The x-plane SDK website claims that the SDK is only
compatible with x64. The PR that adds support for this
fails in x86, so I'm disallow x86 builds to align with
the x-plane documentation.
The x-plane SDK website's examples expect that the sdk
headers are at the root of the include path. I'm adjusting
this port to align with those samples, as we want examples
to "just work" as much as possible.
* [vtk] Change the runtime dir from tools to bin to fix DLL location
* Also move the tools on unixoid OS; Fix tool names in targets files
* Remove duplicate vcpkg_copy_pdbs()
* [vtk] Change version to force rebuild in CI
* [lest] Add lest v1.34.0
* [lest] Add lest v1.34.1
To support vcpkg installations, examples now specify folder 'lest' in the include directives, like: #include "lest/lest.hpp".
* fix: update hash for lest
* [tiff]: disable libwebp support.
Since version 4.0.10, libtiff supports optional compression modes using
either libweb or zstd.
When libtiff is built, and libwebp and/or zstd are found anywhere on the
system, these modes will be enabled. However, the respective libraries
are not added as link targets, so this will result in linker errors for
any unsuspecting project using libtiff.
Since zstd support was already disabled by a previous commit, I have
also simply disabled libwebp support to fix this issue.
A more proper fix might be to add both libwebp and zstd as required
libtiff dependencies, and to patch libtiff's CMakeLists.txt, such that
these libraries are properly linked to. However, it is currently very
unlikely to encounter TIFF images in the wild compressed using either
of these methods, so the effect of disabling support may not be
noticeable at all.
* [tiff] Change CONTROL version
* [corrade] Update to v2019.01
Signed-off-by: Squareys <squareys@googlemail.com>
* [magnum] Update to v2019.01, remove shapes and glutapplication features
These features were deprecated in earlier versions and now removed.
Signed-off-by: Squareys <squareys@googlemail.com>
* [magnum-(extras,plugins,integration)] Update to v2019.01, add imgui feat.
Signed-off-by: Squareys <squareys@googlemail.com>
* [magnum] Improve dependencies to corrade
Signed-off-by: Squareys <squareys@googlemail.com>
* [magnum-plugins] Add faad2audioimporter
- faad2 is currently not in vcpkg, hence commented out
- The commented out empty line is required to have vcpkg parse the file
without issues
Signed-off-by: Squareys <squareys@googlemail.com>
* [ampl-mp] Add new port
This port aims for solver development, so it does not build any
existing solver modules.
The shared library build is disabled for now because it has some
problem on Windows.
closes: #4491
* [ampl-mp] Disable MATLAB MEX support
* fix library exports for iconv on macOS, add Threads dependency for cairo, add the iconv, intl and Threads dependencies to harfbuzz
* updated portfile from harfbuzz fix
* fix indenting and order
* fix portfile
* [gettext] Add unofficial-gettext targets
* [gettext] Fixup for Linux
This is so that you can derive a class from things like `rocksdb::AssociativeMergeOperator`. Perhaps a more "correct" patch would be to see if rtti is enabled for other builds, and enable it here, though it's not clear to me if that's feasible, so I'm suggesting this.
* add support for building hyperscan
* patch hyperscan to work with latest boost
* correct hyperscan source dir name
* speed the build by depending on only the parts of boost we actually need
* make python3 support release-only builds
* upgrade to hyperscan 5.1.0
* remove redundant disambiguate patch
* Add comments about how to build
* restore original x64-windows-static.cmake
* [hyperscan] Check linkage
* [python3] Allow DLLs without LIBs
* [hyperscan] Only static library
* [python3] Revert changes that cause regression in boost-python
* [python3] Revert changes that cause regression in boost-python
* Added cmake targets for nlohmann-json
* [nlohmann-json] Use vcpkg_from_github()
* [nlohmann-json] Enable find_package(nlohmann_json)
* Removed unneeded renaming
* [nlohmann-json] Revert use of vcpkg_from_github() due to archive size of >100MB
* [nlohmann-json] Fix missing natvis
Netcdf and HDF are important _formats_ in the scientific domains (lots of satellite data come in nc or hdf) so having them by default in GDAL seems the most natural.
* [systemc] Add new port (Microsoft#5250)
* [systemc] Fix debug targets
* [systemc] Use vcpkg_extract_source_archive_ex()
* [systemc] Disable vcpkg_test_cmake() for now due to issues
* [systemc] Fixup cmake targets
* Remove the libmysql dependency
The fact that it's not possible to build libmysql for x86 is a source of troubles for projects that have GDAL as a dependency. Though it's possible to build GDAL separately for x64 & x86 this is very confusing and breaks other builds. For example I'm often crossing this issue when trying to build a local GMT package. So the best is to just remove it as a dependency.
```
C:\programs\compa_libs\vcpkg>vcpkg install gmt:x86-windows --recurse
The following packages will be built and installed:
* gdal[core,mysql-libmysql]:x86-windows
gmt[core]:x86-windows
* libmysql[core]:x86-windows
Additional packages (*) will be modified to complete this operation.
Starting package 1/3: libmysql:x86-windows
Building package libmysql[core]:x86-windows...
CMake Error at C:/programs/compa_libs/vcpkg/ports/libmysql/portfile.cmake:10 (message):
Oracle has dropped support in libmysql for 32-bit Windows.
```
* Revert "Remove the libmysql dependency"
* Remove the libmysql dependency
The fact that it's not possible to build libmysql for x86 is a source of troubles for projects that have GDAL as a dependency. Though it's possible to build GDAL separately for x64 & x86 this is very confusing and breaks other builds. For example I'm often crossing this issue when trying to build a local GMT package. So the best is to just remove it as a dependency.
```
C:\programs\compa_libs\vcpkg>vcpkg install gmt:x86-windows --recurse
The following packages will be built and installed:
* gdal[core,mysql-libmysql]:x86-windows
gmt[core]:x86-windows
* libmysql[core]:x86-windows
Additional packages (*) will be modified to complete this operation.
Starting package 1/3: libmysql:x86-windows
Building package libmysql[core]:x86-windows...
CMake Error at C:/programs/compa_libs/vcpkg/ports/libmysql/portfile.cmake:10 (message):
Oracle has dropped support in libmysql for 32-bit Windows.
```
* Update boost to 1.69. Fixes#5023
- Remove boost-signal (rationale: deprecated and removed in 1.69)
- Remove boost-hana workaround by xiangfan-ms #4186#3579 (rationale: 1.69 incorporates required fixes in hana master branch; builds fine in VS2017 15.9)
* [boost-signals] Restore signals from boost 1.68 because it is required by wt
* [boost-vcpkg-helpers] Improve dependency detection
* [boost-iostreams] Revert to cmake build to enable dependencies
* [boost-iostreams] Fix use of zstd in static builds
* [libtorrent] Update to 1.2.0
* [wt] Update to 4.0.5
* [boost-safe-numerics] [boost-vcpkg-helpers] Added safe_numerics; slight mod to regex match
* [hpx] Backport boost 1.69 fixes
* [libtorrent] Clean up cmake file installation
* [boost-type-traits] Fix MSVC arm
* libass dynamic library
it relies on fribidi, harfbuzz, fontconfig, libiconv
* Remove references to iconv and fontconfig
Because this port is currently Windows-only (Fribidi doesn't build on
Linux with vcpkg because of an issue with Meson), we don't want to worry
about FontConfig; DirectWrite should be enough.
* Freetype is important!
* Remove unnecessary fontconfig -- for real
* Remove unnecessary comment
* [BZip2] Fix Unix Dynamic Builds
* [bzip2] Bump control version
* [libgta] Only build one flavor
* [vcpkg_configure_cmake] Resolve#2375 since we now use CMake >= 3.11
* [json-spirit] Add initial port
* Modify PR to using pn85, enable some features
json-spirit is a weird case because the main repo that package managers
tend to use appears to not be actively maintained. Nevertheless, vcpkg
tries to use the "official" source of a repository if at all possible.
In order to do this, I've made the following changes to the PR:
- I've changed the upstream REPO, REF, and SHA512.
- I've passed options to disable building the demos and tests
- I've made the project build only as a static library.
The reason for this is that vcpkg does not support dynamical linkin.
Another reason is that the library as it is in the repo does not have
all the definitions correctly annotated.smlee-hdactech has made a PR
against the major upstream repo to fix this, butwe are going to defer
to the main repo until that change is accepted.
* patch for building dll.
* [xsimd] Add new port
* Add a header include guard to xsimd's algorithm.hpp
algorithm.hpp is not guarded by a header include guard, which can cause
difficulty for users. xhihaoy asked that we be sure to include this
patch because it caused a lot of pain.
* [amqpcpp] Add new port
* Force static linkage for amqpcpp
The documentation for this library says that shared linkage on Windows
is unsupported. Furthermore, the build currently errors out on Windows
because shared DLLs are not placed correctly.
vcpkg only supports static linkage on Linux and macOS, so I'm
categorically making amqpcpp build with static linkage on all platforms.
This unifies the platforms and gives consistent behavior
* add CONTROL and portfile for spectralib 0.7.0
* Rename spectralib -> spectra
I'm making this change based on the naming in the other repositories
that the library is packaged in (DPorts, FreeBSD Ports) and the
terminology used on the website. Code examples use Spectra* for the
prefixes, so I think using "Spectra" is better than "spectralib".
* [json-spirit] Add initial port
* Modify PR to using pn85, enable some features
json-spirit is a weird case because the main repo that package managers
tend to use appears to not be actively maintained. Nevertheless, vcpkg
tries to use the "official" source of a repository if at all possible.
In order to do this, I've made the following changes to the PR:
- I've changed the upstream REPO, REF, and SHA512.
- I've passed options to disable building the demos and tests
- I've made the project build only as a static library.
The reason for this is that vcpkg does not support dynamical linkin.
Another reason is that the library as it is in the repo does not have
all the definitions correctly annotated.smlee-hdactech has made a PR
against the major upstream repo to fix this, butwe are going to defer
to the main repo until that change is accepted.
* [selene] Update to v0.3.
Add libtiff as a dependency.
Update release hash.
Remove the `vcpkg_check_linkage` call, since the relevant symbols for
shared libraries are now explicitly exported.
* [selene] Update to v0.3.1.
Also reinstate linkage check.
