From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/4] package/ogre: remove libglu dependency
Date: Sun, 3 May 2020 19:54:50 +0200 [thread overview]
Message-ID: <20200503175450.GA12536@scaer> (raw)
In-Reply-To: <20200503171227.1411086-1-bernd.kuhls@t-online.de>
Bernd, All,
On 2020-05-03 19:12 +0200, Bernd Kuhls spake thusly:
> "The inclusion of GLU is historical. [...] 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
>
> Add -DGLEW_NO_GLU to get rid of the libglu dependency.
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Series applied to master, with the fixes already reported about the ogre
CXXFLAGS mismatch.
Regards,
Yann E. MORIN.
> ---
> package/ogre/Config.in | 1 -
> package/ogre/ogre.mk | 9 ++++++---
> 2 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/package/ogre/Config.in b/package/ogre/Config.in
> index b5475a7cb6..1d7784714d 100644
> --- a/package/ogre/Config.in
> +++ b/package/ogre/Config.in
> @@ -10,7 +10,6 @@ config BR2_PACKAGE_OGRE
> depends on BR2_USE_WCHAR # use wchar_t
> select BR2_PACKAGE_FREETYPE
> select BR2_PACKAGE_LIBFREEIMAGE
> - select BR2_PACKAGE_LIBGLU # GL/glu.h
> select BR2_PACKAGE_SDL2
> select BR2_PACKAGE_SDL2_OPENGL
> select BR2_PACKAGE_SDL2_X11 # use wmInfo.info.x11
> diff --git a/package/ogre/ogre.mk b/package/ogre/ogre.mk
> index 253e022a73..3387230445 100644
> --- a/package/ogre/ogre.mk
> +++ b/package/ogre/ogre.mk
> @@ -15,7 +15,6 @@ OGRE_DEPENDENCIES = host-pkgconf \
> freetype \
> libfreeimage \
> libgl \
> - libglu \
> sdl2 \
> xlib_libX11 \
> xlib_libXaw \
> @@ -23,12 +22,16 @@ OGRE_DEPENDENCIES = host-pkgconf \
> xlib_libXrandr \
> zziplib
>
> +OGRE_CXX_FLAGS = $(TARGET_CXXFLAGS) -DGLEW_NO_GLU
> +
> # Unbundle freetype and zziplib.
> # Disable java and nvidia cg support.
> OGRE_CONF_OPTS = -DOGRE_BUILD_DEPENDENCIES=OFF \
> -DOGRE_BUILD_COMPONENT_JAVA=OFF \
> -DOGRE_BUILD_PLUGIN_CG=OFF \
> - -DOGRE_INSTALL_DOCS=OFF
> + -DOGRE_INSTALL_DOCS=OFF \
> + -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -DGLEW_NO_GLU" \
> + -DCMAKE_CXX_FLAGS="$(OGRE_CXX_FLAGS)"
>
> # Enable optional python component if python interpreter is present on the target.
> ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
> @@ -41,7 +44,7 @@ endif
>
> # Uses __atomic_fetch_add_8
> ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
> -OGRE_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic"
> +OGRE_CXXFLAGS += -latomic
> endif
>
> $(eval $(cmake-package))
> --
> 2.26.2
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
prev parent reply other threads:[~2020-05-03 17:54 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-03 17:12 [Buildroot] [PATCH 1/4] package/ogre: remove libglu dependency Bernd Kuhls
2020-05-03 17:12 ` [Buildroot] [PATCH 2/4] package/supertux: " Bernd Kuhls
2020-05-03 17:12 ` [Buildroot] [PATCH 3/4] package/libglew: do not depend on libglu Bernd Kuhls
2020-05-03 17:12 ` [Buildroot] [PATCH 4/4] package/supertuxkart: remove libglu dependency Bernd Kuhls
2020-05-03 17:29 ` Ezequiel Garcia
2020-05-03 17:21 ` [Buildroot] [PATCH 1/4] package/ogre: " Yann E. MORIN
2020-05-03 17:54 ` Yann E. MORIN [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200503175450.GA12536@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox