Opera 12.15 Source Code
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

freebsd-11-gcc6.patch 2.7KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566
  1. diff --git a/platforms/unix/base/common/unix_camera.h b/platforms/unix/base/common/unix_camera.h
  2. index 3b747450..4380efa2 100644
  3. --- a/platforms/unix/base/common/unix_camera.h
  4. +++ b/platforms/unix/base/common/unix_camera.h
  5. @@ -15,7 +15,15 @@
  6. #include "modules/img/image.h"
  7. #include "platforms/posix/posix_selector.h"
  8. +#ifdef __FreeBSD__
  9. +typedef uint32_t __u32;
  10. +typedef int32_t __s32;
  11. +typedef uint8_t __u8;
  12. +typedef uint16_t __u16;
  13. +#include <v4l/videodev2.h>
  14. +#else
  15. #include <linux/videodev2.h>
  16. +#endif
  17. class OpBitmap;
  18. class UnixOpCamera;
  19. @@ -27,7 +35,7 @@ class UnixOpCameraManager
  20. #endif // __FreeBSD__
  21. {
  22. public:
  23. -#ifndef __FreeBSD__
  24. +#ifndef __FreeBSD__
  25. static const int MAX_NL_MSG_LEN = 256;
  26. static const int NETLINK_MONITOR_KERNEL_GROUP = 1;
  27. #endif // __FreeBSD__
  28. diff --git a/platforms/flower/module.build/00-gcc.conf.py b/platforms/flower/module.build/00-gcc.conf.py
  29. index ab24053a..d235fa70 100644
  30. --- a/platforms/flower/module.build/00-gcc.conf.py
  31. +++ b/platforms/flower/module.build/00-gcc.conf.py
  32. @@ -46,7 +46,7 @@ class GCC(object):
  33. def codeFlags(self, lang=None, pgo=None):
  34. flags = ['-fshort-wchar', '-fsigned-char']
  35. if lang == 'c++':
  36. - flags += ['-fno-threadsafe-statics', '-fno-exceptions', '-fno-rtti']
  37. + flags += ['-fno-threadsafe-statics', '-fno-exceptions', '-fno-rtti', '-fno-delete-null-pointer-checks']
  38. if config.buildSharedLibrary:
  39. flags += ['-fpic']
  40. if pgo:
  41. @@ -73,7 +73,7 @@ class GCC(object):
  42. if config.optimize:
  43. flags += ['-ffunction-sections', '-fdata-sections']
  44. if self.role == 'linker':
  45. - flags += ['-Wl,--gc-sections']
  46. + flags += ['-Wl,--gc-sections,-rpath=/usr/local/lib/gcc6']
  47. if config.optimizeSize:
  48. flags += ['-Os', '-ffast-math', '-fno-unsafe-math-optimizations']
  49. else:
  50. diff --git a/platforms/flower/module.build/compile.flow.py b/platforms/flower/module.build/compile.flow.py
  51. index f654ac3c..e833252c 100644
  52. --- a/platforms/flower/module.build/compile.flow.py
  53. +++ b/platforms/flower/module.build/compile.flow.py
  54. @@ -108,8 +108,8 @@ def compileSource(self, source, binary, pgo, lang, stem, pch):
  55. compiler = config.targetPlatform.compiler
  56. self['target'] = compiler.target
  57. deps = []
  58. - if pch != 'nopch' and compiler.supportsPrecompiledHeaders:
  59. - deps.append(precompiledHeader(stem=pch, binary=binary, lang=lang))
  60. +# if pch != 'nopch' and compiler.supportsPrecompiledHeaders:
  61. +# deps.append(precompiledHeader(stem=pch, binary=binary, lang=lang))
  62. if pgo == 'use':
  63. deps.append(PGODataFile(source=source, binary=binary))
  64. yield [sourceSetup()] + deps