package/libglew: do not depend on libglu
authorBernd Kuhls <bernd.kuhls@t-online.de>
Sun, 3 May 2020 17:12:26 +0000 (19:12 +0200)
committerYann E. MORIN <yann.morin.1998@free.fr>
Sun, 3 May 2020 17:47:38 +0000 (19:47 +0200)
"The inclusion of GLU is historical. [...] It's not needed for GLEW to
 build or run, but it's opt-out that reason. I'd recommend using
 -DGLEW_NO_GLU since GLU is rarely seen in modern codebases nowadays."
https://github.com/nigels-com/glew/issues/192#issuecomment-411641657

This patch prevents libglu being added to the "Requires:" section of
glew.pc fixing libglew detection in the supertuxkart package

-- Checking for module 'glew>=2.1'
--   Package 'glu', required by 'glew', not found

after libglu is removed as dependency of supertuxkart.

Supertuxkart already uses -DGLEW_NO_GLU:
https://github.com/supertuxkart/stk-code/blob/master/CMakeLists.txt#L224

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
package/libglew/libglew.mk

index 8a07170e99a5317b494d8c8672e2b6f250c2c305..fa262925675f7b1fb1904dd0d355e8bef0ad253c 100644 (file)
@@ -15,6 +15,7 @@ LIBGLEW_DEPENDENCIES = libgl xlib_libX11 xlib_libXext xlib_libXi xlib_libXmu
 # using $TARGET_CONFIGURE_OPTS breaks compilation
 define LIBGLEW_BUILD_CMDS
        $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+               GLEW_NO_GLU="-DGLEW_NO_GLU" \
                GLEW_DEST="/usr" LIBDIR="/usr/lib" \
                AR="$(TARGET_AR)" CC="$(TARGET_CC)" \
                LD="$(TARGET_CC)" STRIP="$(TARGET_STRIP)" \
@@ -23,12 +24,14 @@ endef
 
 define LIBGLEW_INSTALL_STAGING_CMDS
        $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+               GLEW_NO_GLU="-DGLEW_NO_GLU" \
                GLEW_DEST="$(STAGING_DIR)/usr" LIBDIR="$(STAGING_DIR)/usr/lib" \
                $(TARGET_CONFIGURE_OPTS) install
 endef
 
 define LIBGLEW_INSTALL_TARGET_CMDS
        $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+               GLEW_NO_GLU="-DGLEW_NO_GLU" \
                GLEW_DEST="$(TARGET_DIR)/usr" LIBDIR="$(TARGET_DIR)/usr/lib" \
                $(TARGET_CONFIGURE_OPTS) install
 endef