Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=7dad66f4caf13bf89eb3af461275ea0939d849ae
commit 7dad66f4caf13bf89eb3af461275ea0939d849ae Author: crazy <[email protected]> Date: Wed Feb 7 21:06:39 2018 +0100 glm-0.9.8.5-2-x86_64 * rebuild with tc * added gcc7 patch diff --git a/source/x11-extra/glm/FrugalBuild b/source/x11-extra/glm/FrugalBuild index cf4d4c2..edb542d 100644 --- a/source/x11-extra/glm/FrugalBuild +++ b/source/x11-extra/glm/FrugalBuild @@ -3,16 +3,18 @@ pkgname=glm pkgver=0.9.8.5 -pkgrel=1 +pkgrel=2 pkgdesc="OpenGL Mathematics" _F_github_author="g-truc" _F_github_ext=".tar.gz" _F_github_tag="yes" Finclude github cmake -depends=('glibc>=2.25') +source+=('gcc7.patch') +depends=('glibc>=2.27-2') groups=('x11-extra') archs=('x86_64') -sha1sums=('9f7d02d4f36422d1f85b18cfa33349c4da3d944a') -_F_cmake_confopts="-DGLM_TEST_ENABLE=ON" +sha1sums=('9f7d02d4f36422d1f85b18cfa33349c4da3d944a' \ + '1d8cb0eb227acc6b17c764a7245370b2e02e6fc9') +_F_cmake_confopts="-DGLM_TEST_ENABLE=OFF" # optimization OK diff --git a/source/x11-extra/glm/gcc7.patch b/source/x11-extra/glm/gcc7.patch new file mode 100644 index 0000000..68033b5 --- /dev/null +++ b/source/x11-extra/glm/gcc7.patch @@ -0,0 +1,35 @@ +diff -ur glm-0.9.8.5.orig/glm/simd/platform.h glm-0.9.8.5/glm/simd/platform.h +--- glm-0.9.8.5.orig/glm/simd/platform.h 2017-08-16 05:15:24.000000000 -0700 ++++ glm-0.9.8.5/glm/simd/platform.h 2018-01-26 15:38:57.584130263 -0800 +@@ -111,7 +111,8 @@ + #define GLM_COMPILER_GCC70 0x02000A00 + #define GLM_COMPILER_GCC71 0x02000B00 + #define GLM_COMPILER_GCC72 0x02000C00 +-#define GLM_COMPILER_GCC80 0x02000D00 ++#define GLM_COMPILER_GCC73 0x02000D00 ++#define GLM_COMPILER_GCC80 0x02000E00 + + // CUDA + #define GLM_COMPILER_CUDA 0x10000000 +@@ -283,6 +284,8 @@ + # define GLM_COMPILER (GLM_COMPILER_GCC71) + # elif (__GNUC__ == 7) && (__GNUC_MINOR__ == 2) + # define GLM_COMPILER (GLM_COMPILER_GCC72) ++# elif (__GNUC__ == 7) && (__GNUC_MINOR__ == 3) ++# define GLM_COMPILER (GLM_COMPILER_GCC73) + # elif (__GNUC__ >= 8) + # define GLM_COMPILER (GLM_COMPILER_GCC80) + # else +diff -ur glm-0.9.8.5.orig/test/core/core_setup_message.cpp glm-0.9.8.5/test/core/core_setup_message.cpp +--- glm-0.9.8.5.orig/test/core/core_setup_message.cpp 2017-08-16 05:15:24.000000000 -0700 ++++ glm-0.9.8.5/test/core/core_setup_message.cpp 2018-01-26 15:37:56.953298475 -0800 +@@ -86,6 +86,9 @@ + case GLM_COMPILER_GCC72: + std::printf("GCC 7.2\n"); + break; ++ case GLM_COMPILER_GCC73: ++ std::printf("GCC 7.3\n"); ++ break; + case GLM_COMPILER_GCC80: + std::printf("GCC 8.0\n"); + break; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
