diff --git a/mingw-w64-vera++/0002-link-to-shared-boost.patch b/mingw-w64-vera++/0002-link-to-shared-boost.patch new file mode 100644 index 0000000000..7b8ccb5113 --- /dev/null +++ b/mingw-w64-vera++/0002-link-to-shared-boost.patch @@ -0,0 +1,11 @@ +--- a/src/boost.cmake ++++ b/src/boost.cmake +@@ -21,7 +21,7 @@ + endif() + + if(VERA_USE_SYSTEM_BOOST) +- if(WIN32) ++ if(MSVC) + # use boost static libs to avoid LNK2019 errors + # feel free to contribute a better fix! + set(Boost_USE_STATIC_LIBS ON) diff --git a/mingw-w64-vera++/PKGBUILD b/mingw-w64-vera++/PKGBUILD index b63375ce07..254b72bd64 100644 --- a/mingw-w64-vera++/PKGBUILD +++ b/mingw-w64-vera++/PKGBUILD @@ -4,8 +4,8 @@ _realname=vera++ pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.3.0 -pkgrel=8 -pkgdesc="A programmable tool for verification, analysis and transformation of C++ source code" +pkgrel=9 +pkgdesc="A programmable tool for verification, analysis and transformation of C++ source code (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') url="https://bitbucket.org/verateam/vera" @@ -14,15 +14,19 @@ depends=("${MINGW_PACKAGE_PREFIX}-tcl" "${MINGW_PACKAGE_PREFIX}-boost" "${MINGW_PACKAGE_PREFIX}-python") makedepends=("${MINGW_PACKAGE_PREFIX}-cc" - "${MINGW_PACKAGE_PREFIX}-cmake") + "${MINGW_PACKAGE_PREFIX}-cmake" + "${MINGW_PACKAGE_PREFIX}-ninja") source=(https://bitbucket.org/verateam/vera/downloads/${_realname}-${pkgver}.tar.gz - 0001-fix_python_detection_issues.patch) + 0001-fix_python_detection_issues.patch + 0002-link-to-shared-boost.patch) sha256sums=('9415657a09438353489db10ca860dd6459e446cfd9c649a1a2e02268da66f270' - '6e801c0f612962b2de75a17de4651e4f769032b35975cb3bdec5defa00697a69') + '6e801c0f612962b2de75a17de4651e4f769032b35975cb3bdec5defa00697a69' + '51caadf3f0490240c2e9673acaddfd367992e7202aceebb817ec7b164a596c57') prepare() { cd "${srcdir}/${_realname}-${pkgver}" patch -Np0 -i "${srcdir}/0001-fix_python_detection_issues.patch" + patch -Np1 -i "${srcdir}/0002-link-to-shared-boost.patch" } build() { @@ -30,7 +34,7 @@ build() { MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake.exe \ - -G"MSYS Makefiles" \ + -G"Ninja" \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DVERA_LUA=Off \ -DVERA_USE_SYSTEM_BOOST=ON \ @@ -43,4 +47,6 @@ build() { package() { cd build-${MSYSTEM} DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install . + install -Dm644 "${srcdir}"/${_realname}-${pkgver}/LICENSE_1_0.txt \ + "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE }