From 1dcfa6793a4f3e69152e615a7e003dda23d4250c Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Wed, 9 Oct 2019 08:40:52 +0300 Subject: [PATCH] yaml-cpp: Fix building shared library. Build both shared and static --- mingw-w64-yaml-cpp/PKGBUILD | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/mingw-w64-yaml-cpp/PKGBUILD b/mingw-w64-yaml-cpp/PKGBUILD index 096160bc4c..88b018fbc0 100644 --- a/mingw-w64-yaml-cpp/PKGBUILD +++ b/mingw-w64-yaml-cpp/PKGBUILD @@ -4,7 +4,7 @@ _realname=yaml-cpp pkgbase="mingw-w64-${_realname}" pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=0.6.3 -pkgrel=1 +pkgrel=2 pkgdesc="A YAML parser and emitter in C++ matching the YAML 1.2 spec (mingw-w64)" arch=('any') url="https://github.com/jbeder/yaml-cpp" @@ -26,23 +26,39 @@ prepare() { } build() { - [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}" - mkdir -p ${srcdir}/build-${MINGW_CHOST} - cd ${srcdir}/build-${MINGW_CHOST} + msg2 "Build shared library" + [[ -d "build-${MINGW_CHOST}-shared" ]] && rm -rf "build-${MINGW_CHOST}-shared" + mkdir -p ${srcdir}/build-${MINGW_CHOST}-shared && cd ${srcdir}/build-${MINGW_CHOST}-shared MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake.exe \ -G"MSYS Makefiles" \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ - -DBUILD_SHARED_LIBS=ON \ + -DYAML_BUILD_SHARED_LIBS=ON \ -DYAML_CPP_BUILD_TESTS=OFF \ ../${_realname}-${_realname}-${pkgver} + make + msg2 "Build static library" + [[ -d "build-${MINGW_CHOST}-static" ]] && rm -rf "build-${MINGW_CHOST}-static" + mkdir -p ${srcdir}/build-${MINGW_CHOST}-static && cd ${srcdir}/build-${MINGW_CHOST}-static + + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ + ${MINGW_PREFIX}/bin/cmake.exe \ + -G"MSYS Makefiles" \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ + -DYAML_BUILD_SHARED_LIBS=OFF \ + -DYAML_CPP_BUILD_TESTS=OFF \ + ../${_realname}-${_realname}-${pkgver} make } package() { - cd "${srcdir}/build-${MINGW_CHOST}" + cd "${srcdir}/build-${MINGW_CHOST}-static" make DESTDIR=${pkgdir} install + + cd "${srcdir}/build-${MINGW_CHOST}-shared" + make DESTDIR=${pkgdir} install + install -Dm644 ${srcdir}/${_realname}-${_realname}-${pkgver}/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE }