From e709f287875a195a10851c3765169e21a98091c4 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Mon, 30 May 2016 17:59:51 +0200 Subject: [PATCH] glm: switch to build_style=cmake Fixes #4240 --- srcpkgs/glm/patches/fix-path.patch | 11 +++++++++++ srcpkgs/glm/template | 12 +++--------- 2 files changed, 14 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/glm/patches/fix-path.patch diff --git a/srcpkgs/glm/patches/fix-path.patch b/srcpkgs/glm/patches/fix-path.patch new file mode 100644 index 00000000000..37d53fe9a29 --- /dev/null +++ b/srcpkgs/glm/patches/fix-path.patch @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2016-05-30 17:56:45.738244928 +0200 ++++ CMakeLists.txt 2016-05-30 17:57:44.079247938 +0200 +@@ -176,7 +176,7 @@ + + install( + FILES +- "${CMAKE_CURRENT_BINARY_DIR}/${GLM_INSTALL_CONFIGDIR}/glmConfig.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/glmConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/glmVersion.cmake" + DESTINATION ${GLM_INSTALL_CONFIGDIR} + ) diff --git a/srcpkgs/glm/template b/srcpkgs/glm/template index 3f06fd3066f..b6cec3e38fb 100644 --- a/srcpkgs/glm/template +++ b/srcpkgs/glm/template @@ -1,8 +1,9 @@ # Template file for 'glm' pkgname=glm version=0.9.7.5 -revision=1 +revision=2 noarch=yes +build_style=cmake hostmakedepends="unzip" maintainer="Juan RP " license="MIT" @@ -12,13 +13,6 @@ distfiles="https://github.com/g-truc/glm/releases/download/${version}/glm-${vers checksum=f39a908c6519e70ea1e91a8732e69aed84d28c46bc01cc3dedf71ca88b06716f wrksrc=${pkgname} -do_install() { - vmkdir usr/include/glm - vmkdir usr/share/doc - vcopy glm usr/include - vcopy doc usr/share/doc/glm - rm -f ${DESTDIR}/usr/include/glm/CMakeLists.txt - find ${DESTDIR} -type f -exec chmod 644 {} \; - find ${DESTDIR} -type d -exec chmod 755 {} \; +post_install() { vlicense copying.txt }