mirror of
https://git.freebsd.org/ports.git
synced 2025-06-30 09:00:33 -04:00
893d9b13f0
- Use https in WWW and MASTER_SITES - Sort ONLY_FOR_ARCHS, USES, USE_GNOME and GN_ARGS - Put in correct place MAKE_ENV+= V=1 variable - Use LLD linker by default for supported archs - Fix DEBUG option - Fix gpu_info_collector.cc warning: control may reach end of non-void function [-Wreturn-type] - Get rid of multiple definition errors Changelog: https://chromium.googlesource.com/chromium/src/+log/58.0.3029.110..59.0.3071.104?pretty=fuller&n=10000 MFH: 2017Q2 Security: https://www.vuxml.org/freebsd/52f4b48b-4ac3-11e7-99aa-e8e0b747a45a.html Security: https://www.vuxml.org/freebsd/f53dd5cc-527f-11e7-a772-e8e0b747a45a.html
30 lines
1,007 B
C++
30 lines
1,007 B
C++
--- gpu/config/gpu_test_config.cc.orig 2017-06-05 19:03:08 UTC
|
|
+++ gpu/config/gpu_test_config.cc
|
|
@@ -24,7 +24,7 @@ namespace {
|
|
GPUTestConfig::OS GetCurrentOS() {
|
|
#if defined(OS_CHROMEOS)
|
|
return GPUTestConfig::kOsChromeOS;
|
|
-#elif defined(OS_LINUX) || defined(OS_OPENBSD)
|
|
+#elif defined(OS_LINUX) || defined(OS_BSD)
|
|
return GPUTestConfig::kOsLinux;
|
|
#elif defined(OS_WIN)
|
|
int32_t major_version = 0;
|
|
@@ -255,6 +255,10 @@ bool GPUTestBotConfig::LoadCurrentConfig(const GPUInfo
|
|
bool rt;
|
|
if (gpu_info == NULL) {
|
|
GPUInfo my_gpu_info;
|
|
+#if defined(OS_FREEBSD)
|
|
+ rt = false;
|
|
+ LOG(WARNING) << "CollectGpuID not present on FreeBSD";
|
|
+#else
|
|
CollectInfoResult result = CollectBasicGraphicsInfo(&my_gpu_info);
|
|
if (result != kCollectInfoSuccess) {
|
|
LOG(ERROR) << "Fail to identify GPU";
|
|
@@ -263,6 +267,7 @@ bool GPUTestBotConfig::LoadCurrentConfig(const GPUInfo
|
|
} else {
|
|
rt = SetGPUInfo(my_gpu_info);
|
|
}
|
|
+#endif
|
|
} else {
|
|
rt = SetGPUInfo(*gpu_info);
|
|
}
|