diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2018-07-08 08:58:30 +0000 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2018-07-08 08:58:30 +0000 |
| commit | 414e557908c4f9c0c2b8b76183191369b13974f8 (patch) | |
| tree | 2f951d5b87b44b2bd17a33510e51b1ffa276f60b /extra | |
| parent | 049f8341240656b32f5bdd648998e6bf501b5382 (diff) | |
| parent | d39b7a41ac6092968e479de6c67265be261e444d (diff) | |
| download | packages-414e557908c4f9c0c2b8b76183191369b13974f8.tar.xz | |
Merge branch 'master' into i486
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/cmake/PKGBUILD | 10 | ||||
| -rw-r--r-- | extra/cmake/cmake-3.11.4-find-libuv.patch | 12 | ||||
| -rw-r--r-- | extra/meson/PKGBUILD | 9 |
3 files changed, 22 insertions, 9 deletions
diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index d1758858..e8479e7b 100644 --- a/extra/cmake/PKGBUILD +++ b/extra/cmake/PKGBUILD @@ -1,3 +1,13 @@ +# Patch: https://gitlab.kitware.com/cmake/cmake/commit/2c36dabbeef72e2d9c9697e6dcc5c67fd0a912dd + +source+=('cmake-3.11.4-find-libuv.patch') +sha512sums+=('0477e9380834f8621251a7d81f83bc3851c1d7bba78756616b61dd97680dc3c00d2da222a9e40b615e7020691dbcb0131abcd199cee6a723578d724fcaee7288') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i "$srcdir/cmake-3.11.4-find-libuv.patch" +} + # 486-specific if [ "${CARCH}" = "i486" ]; then # no Python Shinx diff --git a/extra/cmake/cmake-3.11.4-find-libuv.patch b/extra/cmake/cmake-3.11.4-find-libuv.patch new file mode 100644 index 00000000..95a39cc3 --- /dev/null +++ b/extra/cmake/cmake-3.11.4-find-libuv.patch @@ -0,0 +1,12 @@ +diff -rauN cmake-3.11.4/Source/Modules/FindLibUV.cmake cmake-3.11.4-find-libuv-patch/Source/Modules/FindLibUV.cmake +--- cmake-3.11.4/Source/Modules/FindLibUV.cmake 2018-06-14 14:57:31.000000000 +0200 ++++ cmake-3.11.4-find-libuv-patch/Source/Modules/FindLibUV.cmake 2018-07-08 10:24:02.051505971 +0200 +@@ -63,6 +63,8 @@ + set(_LibUV_H_REGEX "#[ \t]*define[ \t]+UV_VERSION_(MAJOR|MINOR|PATCH)[ \t]+[0-9]+") + if(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv-version.h") + file(STRINGS "${LibUV_INCLUDE_DIR}/uv-version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}") ++elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv/version.h") ++ file(STRINGS "${LibUV_INCLUDE_DIR}/uv/version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}") + elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv.h") + file(STRINGS "${LibUV_INCLUDE_DIR}/uv.h" _LibUV_H REGEX "${_LibUV_H_REGEX}") + else() diff --git a/extra/meson/PKGBUILD b/extra/meson/PKGBUILD deleted file mode 100644 index aacaba9c..00000000 --- a/extra/meson/PKGBUILD +++ /dev/null @@ -1,9 +0,0 @@ -checkdepends=( - $( - printf '%s\n' "${checkdepends[@]}" | \ - sed ' - s/^java-environment>=8$/java-environment=8/ - /^dmd$/d - ' - ) -) |