diff --git a/mingw-w64-prjtrellis/.gitignore b/mingw-w64-prjtrellis/.gitignore new file mode 100644 index 0000000000..ebb28691d5 --- /dev/null +++ b/mingw-w64-prjtrellis/.gitignore @@ -0,0 +1 @@ +prjtrellis-db diff --git a/mingw-w64-prjtrellis/001-fix-build-with-boost-built-with-cmake.patch b/mingw-w64-prjtrellis/001-fix-build-with-boost-built-with-cmake.patch new file mode 100644 index 0000000000..91c728a949 --- /dev/null +++ b/mingw-w64-prjtrellis/001-fix-build-with-boost-built-with-cmake.patch @@ -0,0 +1,10 @@ +--- a/libtrellis/CMakeLists.txt ++++ b/libtrellis/CMakeLists.txt +@@ -52,7 +52,6 @@ + else() + add_definitions(-DNO_THREADS) + endif() +-set(Boost_NO_BOOST_CMAKE ON) + + find_package(Python3 3.5 REQUIRED COMPONENTS Interpreter) + if (BUILD_PYTHON) diff --git a/mingw-w64-prjtrellis/PKGBUILD b/mingw-w64-prjtrellis/PKGBUILD index 745e194282..f4e288bb30 100644 --- a/mingw-w64-prjtrellis/PKGBUILD +++ b/mingw-w64-prjtrellis/PKGBUILD @@ -4,7 +4,7 @@ _realname=prjtrellis pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.4 -pkgrel=3 +pkgrel=4 pkgdesc="Documenting the Lattice ECP5 bit-stream format (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -21,13 +21,18 @@ makedepends=( "${MINGW_PACKAGE_PREFIX}-ninja" "git" ) -_commit_db='35d900a94ff0db152679a67bf6e4fbf40ebc34aa' +_commit_db='ce8cdafe7a8c718f0ec43895894b668a479ba33f' source=("https://github.com/YosysHQ/prjtrellis/archive/${pkgver}/${_realname}-${pkgver}.tar.gz" - "${_realname}-db"::"git+https://github.com/YosysHQ/prjtrellis-db.git#commit=${_commit_db}") + "${_realname}-db"::"git+https://github.com/YosysHQ/prjtrellis-db.git#commit=${_commit_db}" + "001-fix-build-with-boost-built-with-cmake.patch") sha256sums=('46fe9d98676953e0cccf1d6332755d217a0861e420f1a12dabfda74d81ccc147' - 'SKIP') + '7f4f327c03ba5daa05d3349f32e7465c3cc1e649d684b1a68884205e0e1eb96c' + '779a9b7822b0836be17a6a47726e7892046a59c29a6c4fb5962ad386d500335c') prepare () { + cd "${srcdir}"/${_realname}-${pkgver} + patch -p1 -i "${srcdir}"/001-fix-build-with-boost-built-with-cmake.patch + cd "${srcdir}/${_realname}-db" cp -r * "${srcdir}/${_realname}-${pkgver}/database/" } @@ -71,5 +76,6 @@ package() { DESTDIR="${pkgdir}" "${MINGW_PREFIX}"/bin/cmake.exe --install . - install -Dm644 "${srcdir}/${_realname}-${pkgver}"/COPYING "${pkgdir}${MINGW_PREFIX}"/share/licenses/${_realname}/LICENSE + install -Dm644 "${srcdir}/${_realname}-${pkgver}"/COPYING \ + "${pkgdir}${MINGW_PREFIX}"/share/licenses/${_realname}/LICENSE }