logo

overlay

My own overlay for experimentations, use with caution, no support is provided git clone https://hacktivis.me/git/overlay.git

freeglut-3.2.1-gcc10-fno-common.patch (3500B)

    

  1. From 5791564dd934d193df771a0a7c52013e9f456aa1 Mon Sep 17 00:00:00 2001
  2. From: Sergei Trofimovich <slyfox@gentoo.org>
  3. Date: Tue, 21 Jan 2020 22:33:49 +0000
  4. Subject: [PATCH] fg_gl2: fix build failure against gcc-10
  6. On gcc-10 (and gcc-9 -fno-common) build fails as:
  8. ```
  9. [ 31%] Linking C executable bin/Lorenz_static
  10. /usr/bin/cmake -E cmake_link_script CMakeFiles/Lorenz_static.dir/link.txt --verbose=1
  11. /usr/lib/ccache/bin/cc  -Wall -pedantic  -rdynamic CMakeFiles/Lorenz_static.dir/progs/demos/Lorenz/lorenz.c.o \
  12.    -o bin/Lorenz_static  -lGLU -lGL -lm -lX11 -lXrandr -lXxf86vm -lXi -lm lib/libglut.a -lGL -lm -lX11 -lXrandr -lXxf86vm -lXi
  13. ld: lib/libglut.a(fg_gl2.c.o):(.bss+0x0):
  14.   multiple definition of `fghGenBuffers'; lib/libglut.a(fg_window.c.o):(.bss+0x0): first defined here
  15. ld: lib/libglut.a(fg_gl2.c.o):(.bss+0x8):
  16.   multiple definition of `fghDeleteBuffers'; lib/libglut.a(fg_window.c.o):(.bss+0x8): first defined here
  17. ```
  19. Note: duplicate definition comes here from 'fg_gl2.h'.
  20. The fix is to move declaration to a 'fg_gl2.c' file.
  22. gcc-10 will change the default from -fcommon to fno-common:
  23. https://gcc.gnu.org/PR85678.
  25. The error also happens if CFLAGS=-fno-common passed explicitly.
  27. Bug: https://bugs.gentoo.org/705840
  28. Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
  29. ---
  30.  src/fg_gl2.c | 12 ++++++++++++
  31.  src/fg_gl2.h | 14 +++++++-------
  32.  2 files changed, 19 insertions(+), 7 deletions(-)
  34. diff --git a/freeglut/freeglut/src/fg_gl2.c b/freeglut/freeglut/src/fg_gl2.c
  35. index 38b0acbb..f79c432a 100644
  36. --- a/src/fg_gl2.c
  37. +++ b/src/fg_gl2.c
  38. @@ -27,6 +27,18 @@
  39.  #include "fg_internal.h"
  40.  #include "fg_gl2.h"
  41.  
  42. +#ifdef GL_ES_VERSION_2_0
  43. +/* Use existing functions on GLES 2.0 */
  44. +#else
  45. +FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
  46. +FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
  47. +FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
  48. +FGH_PFNGLBUFFERDATAPROC fghBufferData;
  49. +FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
  50. +FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
  51. +FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
  52. +#endif
  53. +
  54.  void FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib) {
  55.    if (fgStructure.CurrentWindow != NULL)
  56.      fgStructure.CurrentWindow->Window.attribute_v_coord = attrib;
  57. diff --git a/freeglut/freeglut/src/fg_gl2.h b/freeglut/freeglut/src/fg_gl2.h
  58. index ab8ba5c7..fb3d4676 100644
  59. --- a/src/fg_gl2.h
  60. +++ b/src/fg_gl2.h
  61. @@ -67,13 +67,13 @@ typedef void (APIENTRY *FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
  62.  typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint);
  63.  typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
  64.  
  65. -FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
  66. -FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
  67. -FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
  68. -FGH_PFNGLBUFFERDATAPROC fghBufferData;
  69. -FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
  70. -FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
  71. -FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
  72. +extern FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
  73. +extern FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
  74. +extern FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
  75. +extern FGH_PFNGLBUFFERDATAPROC fghBufferData;
  76. +extern FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
  77. +extern FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
  78. +extern FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
  79.  
  80.  #    endif
  81.