diff options
| author | Yuri Victorovich <yuri@FreeBSD.org> | 2022-07-19 00:08:35 -0700 |
|---|---|---|
| committer | Yuri Victorovich <yuri@FreeBSD.org> | 2022-07-19 00:09:56 -0700 |
| commit | b32b6222e87ce3ba54f2779ba5cd36f1d37f5b5d (patch) | |
| tree | e3dec78b059ada39e732e32909d10338fa726b86 /x11-toolkits | |
| parent | security/libpki: Fix LDAP option build (diff) | |
x11-toolkits/nanogui: Fix build on non-Intel architectures
... by removing bogus native compilation flags.
Reported by: fallout
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/nanogui/Makefile | 2 | ||||
| -rw-r--r-- | x11-toolkits/nanogui/files/patch-CMakeLists.txt | 24 |
2 files changed, 20 insertions, 6 deletions
diff --git a/x11-toolkits/nanogui/Makefile b/x11-toolkits/nanogui/Makefile index 8ea7405e6152..d61dd7a3de6c 100644 --- a/x11-toolkits/nanogui/Makefile +++ b/x11-toolkits/nanogui/Makefile @@ -9,8 +9,6 @@ COMMENT= Minimalistic GUI library for OpenGL LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BROKEN_aarch64= error: the clang compiler does not support '-march=nehalem', see https://github.com/mitsuba-renderer/nanogui/issues/118 - LIB_DEPENDS= libglfw.so:graphics/glfw TEST_DEPENDS= zenity:x11/zenity diff --git a/x11-toolkits/nanogui/files/patch-CMakeLists.txt b/x11-toolkits/nanogui/files/patch-CMakeLists.txt index 9a10b4409cb3..296032ec8234 100644 --- a/x11-toolkits/nanogui/files/patch-CMakeLists.txt +++ b/x11-toolkits/nanogui/files/patch-CMakeLists.txt @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2022-04-10 13:30:19 UTC +--- CMakeLists.txt.orig 2022-02-15 15:25:41 UTC +++ CMakeLists.txt @@ -1,6 +1,8 @@ cmake_minimum_required (VERSION 3.13..3.18) @@ -9,7 +9,23 @@ # Extract project version from source file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/include/nanogui/common.h" nanogui_version_defines REGEX "#define NANOGUI_VERSION_(MAJOR|MINOR|PATCH) ") -@@ -497,6 +504,12 @@ if (EXISTS /opt/vc/include) +@@ -78,6 +80,7 @@ endif() + # default. You may want to set MTS_NATIVE_FLAGS to "-march=native" to use all + # instructions available on a particular machine. + ++if (FALSE) # disable NANOGUI_NATIVE_FLAGS_DEFAULT to allow to build on all architectures + if (MSVC) + set(NANOGUI_NATIVE_FLAGS_DEFAULT "") + elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") +@@ -86,6 +89,7 @@ elseif (APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm + else() + set(NANOGUI_NATIVE_FLAGS_DEFAULT "-march=nehalem") + endif() ++endif() + + option(NANOGUI_BUILD_EXAMPLES "Build NanoGUI example application?" ON) + option(NANOGUI_BUILD_SHARED "Build NanoGUI as a shared library?" ${NANOGUI_BUILD_SHARED_DEFAULT}) +@@ -497,6 +501,12 @@ if (EXISTS /opt/vc/include) target_include_directories(nanogui PUBLIC /opt/vc/include) endif() @@ -22,7 +38,7 @@ if (NANOGUI_INSTALL) install(TARGETS nanogui LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -@@ -522,6 +535,7 @@ if (NANOGUI_INSTALL) +@@ -522,6 +532,7 @@ if (NANOGUI_INSTALL) set(NANOGUI_CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_DATAROOTDIR}/cmake/nanogui") @@ -30,7 +46,7 @@ configure_package_config_file( resources/nanoguiConfig.cmake.in nanoguiConfig.cmake INSTALL_DESTINATION ${NANOGUI_CMAKECONFIG_INSTALL_DIR}) -@@ -580,7 +594,7 @@ if (NANOGUI_BUILD_PYTHON) +@@ -580,7 +591,7 @@ if (NANOGUI_BUILD_PYTHON) list(APPEND CMAKE_PREFIX_PATH "${_tmp_dir}") find_package(pybind11 CONFIG REQUIRED) else() |