diff options
| author | Linus Heckemann <git@sphalerite.org> | 2018-01-06 00:02:21 +0100 |
|---|---|---|
| committer | Alexander Foremny <aforemny@posteo.de> | 2018-01-11 19:30:19 +0300 |
| commit | 9ab77680b6a56304f04d5c5266663d7c622d5491 (patch) | |
| tree | 157aa34e574cbd205fd47ea67f4dbaa08116475e /pkgs/development/libraries/bullet/gwen-narrowing.patch | |
| parent | 93cdceafb866986fef64899d00e3f5ebff8252f7 (diff) | |
| download | nixpkgs-9ab77680b6a56304f04d5c5266663d7c622d5491.tar nixpkgs-9ab77680b6a56304f04d5c5266663d7c622d5491.tar.gz nixpkgs-9ab77680b6a56304f04d5c5266663d7c622d5491.tar.bz2 nixpkgs-9ab77680b6a56304f04d5c5266663d7c622d5491.tar.lz nixpkgs-9ab77680b6a56304f04d5c5266663d7c622d5491.tar.xz nixpkgs-9ab77680b6a56304f04d5c5266663d7c622d5491.tar.zst nixpkgs-9ab77680b6a56304f04d5c5266663d7c622d5491.zip | |
bullet: fix build on aarch64
Diffstat (limited to 'pkgs/development/libraries/bullet/gwen-narrowing.patch')
| -rw-r--r-- | pkgs/development/libraries/bullet/gwen-narrowing.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/pkgs/development/libraries/bullet/gwen-narrowing.patch b/pkgs/development/libraries/bullet/gwen-narrowing.patch new file mode 100644 index 00000000000..c6c06325dae --- /dev/null +++ b/pkgs/development/libraries/bullet/gwen-narrowing.patch @@ -0,0 +1,22 @@ +commit a5d3497577c78b03c05c69d17df972fa9fb54f53 +Author: Linus Heckemann <git@sphalerite.org> +Date: Fri Jan 5 23:57:09 2018 +0100 + + Add -Wno-narrowing to GWEN's CMakeLists + + This avoids the compilation issue that occurs on aarch64 with gcc6. + (nixpkgs-specific patch) + +diff --git a/examples/ThirdPartyLibs/Gwen/CMakeLists.txt b/examples/ThirdPartyLibs/Gwen/CMakeLists.txt +index 82fa0ffba..26c4bbd37 100644 +--- a/examples/ThirdPartyLibs/Gwen/CMakeLists.txt ++++ b/examples/ThirdPartyLibs/Gwen/CMakeLists.txt +@@ -15,7 +15,7 @@ IF(NOT WIN32 AND NOT APPLE) + ADD_DEFINITIONS("-DDYNAMIC_LOAD_X11_FUNCTIONS=1") + ENDIF() + +-ADD_DEFINITIONS( -DGLEW_STATIC -DGWEN_COMPILE_STATIC -D_HAS_EXCEPTIONS=0 -D_STATIC_CPPLIB ) ++ADD_DEFINITIONS( -DGLEW_STATIC -DGWEN_COMPILE_STATIC -D_HAS_EXCEPTIONS=0 -D_STATIC_CPPLIB -Wno-narrowing ) + + FILE(GLOB gwen_SRCS "*.cpp" "Controls/*.cpp" "Controls/Dialog/*.cpp" "Controls/Dialogs/*.cpp" "Controls/Layout/*.cpp" "Controls/Property/*.cpp" "Input/*.cpp" "Platforms/*.cpp" "Renderers/*.cpp" "Skins/*.cpp") + FILE(GLOB gwen_HDRS "*.h" "Controls/*.h" "Controls/Dialog/*.h" "Controls/Dialogs/*.h" "Controls/Layout/*.h" "Controls/Property/*.h" "Input/*.h" "Platforms/*.h" "Renderers/*.h" "Skins/*.h") |