diff --git a/mingw-w64-ruc/0002-ruc-2.4.3-gnu-install-dirs.patch b/mingw-w64-ruc/0002-ruc-2.4.3-gnu-install-dirs.patch index 08d7d31512..92442fc03e 100644 --- a/mingw-w64-ruc/0002-ruc-2.4.3-gnu-install-dirs.patch +++ b/mingw-w64-ruc/0002-ruc-2.4.3-gnu-install-dirs.patch @@ -1,15 +1,14 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 50dd412e..e1ad4c86 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -66,6 +66,8 @@ endfunction() +@@ -70,7 +70,8 @@ endfunction() # Set install parameters get_all_targets(targets .) +include(GNUInstallDirs) install(TARGETS ${targets} - RUNTIME DESTINATION ${PROJECT_NAME} -- LIBRARY DESTINATION ${PROJECT_NAME}) +- LIBRARY DESTINATION ${PROJECT_NAME} +- ARCHIVE DESTINATION ${PROJECT_NAME}) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/mingw-w64-ruc/PKGBUILD b/mingw-w64-ruc/PKGBUILD index 010d444f42..e5ccd95e7d 100644 --- a/mingw-w64-ruc/PKGBUILD +++ b/mingw-w64-ruc/PKGBUILD @@ -4,7 +4,7 @@ _realName=RuC _realname=${_realName,,} pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=2.4.3 +pkgver=2.4.4 pkgrel=1 pkgdesc="Yet another compiler from Russian version of C into virtual machine (mingw-w64)" arch=('any') @@ -17,20 +17,17 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" "${MINGW_PACKAGE_PREFIX}-cc") source=("${_realName}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz" - "0001-ruc-2.4.3-win32.patch::${url}/commit/5a7e333d12c723e8f7277ee52ddbeec4fa19ab29.patch" - '0002-ruc-2.4.3-gnu-install-dirs.patch' - '0003-ruc-2.4.3-libruc-prefix.patch' - '0004-ruc-2.4.3-codegen-env.patch') -sha256sums=('7846c476fd63b9d0ca1e8d15aa297328bcb80fc3de85ec0ec3c9f149e4e67e4c' - '9fec9cd7aeb8dcdd7bb64e80e5d4760e2d25cf95709ecbf98a4b6b6f00230ea4' - '51faa02b2f19d635036b402591541a22cb7d611bc387f4899c28454d15ab02da' + '0002-ruc-2.4.3-gnu-install-dirs.patch' + '0003-ruc-2.4.3-libruc-prefix.patch' + '0004-ruc-2.4.3-codegen-env.patch') +sha256sums=('94d9961030a7a678878fbc18c9ac9896c196d3887cc511bba65012d14d815aab' + 'bb6f6f8824b008e38a388ca74d5698dedc7864282960830982df6514e34cec7f' 'd27579d289c975dfa48375c215013a12977097ef9dad6c2547e3a9107894b486' '6a11f0bf10c4237d1cc09447a59070b905530fa6b3d6fb2df0b5d649808881b3') prepare() { cd "${srcdir}"/${_realName}-${pkgver} - patch -Np1 -i "${srcdir}"/0001-ruc-2.4.3-win32.patch patch -Np1 -i "${srcdir}"/0002-ruc-2.4.3-gnu-install-dirs.patch patch -Np1 -i "${srcdir}"/0003-ruc-2.4.3-libruc-prefix.patch patch -Np1 -i "${srcdir}"/0004-ruc-2.4.3-codegen-env.patch @@ -52,7 +49,7 @@ build() { -GNinja \ -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \ "${extra_config[@]}" \ - -DBUILD_{SHARED,STATIC}_LIBS=ON \ + -DBUILD_SHARED_LIBS=ON \ ../${_realName}-${pkgver} "${MINGW_PREFIX}"/bin/cmake.exe --build .