Skip to contentSkip to conversation

package/cegui/cegui.mk: fix typos

PATCH New Bartosz Bilas 2 participants 3 messages Apr 4, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/cegui/cegui.mk: fix typos

Configure options should be passed via CONF_OPTS not CONF_OTPS.

---
 package/cegui/cegui.mk | 52 +++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 26 deletions(-)
package/cegui/cegui.mk +26 -26
index 657492a7f7..9a15511816 100644
@@ -25,93 +25,93 @@ endif
 
 ifeq ($(BR2_PACKAGE_OGRE),y)
 CEGUI_DEPENDENCIES += ogre
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_RENDERER_OGRE=ON
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_RENDERER_OGRE=ON
 else
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_RENDERER_OGRE=OFF
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_RENDERER_OGRE=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_EXPAT),y)
 CEGUI_DEPENDENCIES += expat
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_EXPAT=ON
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_EXPAT=ON
 else
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_EXPAT=OFF
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_EXPAT=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_IRRLICHT),y)
 CEGUI_DEPENDENCIES += irrlicht
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_RENDERER_IRRLICHT=ON
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_RENDERER_IRRLICHT=ON
 else
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_RENDERER_IRRLICHT=OFF
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_RENDERER_IRRLICHT=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_SDL2)$(BR2_PACKAGE_SDL2_IMAGE),yy)
 CEGUI_DEPENDENCIES += sdl2 sdl2_image
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_IMAGECODEC_SDL2=ON
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_IMAGECODEC_SDL2=ON
 else
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_IMAGECODEC_SDL2=OFF
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_IMAGECODEC_SDL2=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_PCRE),y)
 CEGUI_DEPENDENCIES += pcre
-CEGUI_CONF_OTPS += -DCEGUI_HAS_PCRE_REGEX=ON
+CEGUI_CONF_OPTS += -DCEGUI_HAS_PCRE_REGEX=ON
 else
-CEGUI_CONF_OTPS += -DCEGUI_HAS_PCRE_REGEX=OFF
+CEGUI_CONF_OPTS += -DCEGUI_HAS_PCRE_REGEX=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_FREETYPE),y)
 CEGUI_DEPENDENCIES += freetype
-CEGUI_CONF_OTPS += -DCEGUI_HAS_FREETYPE=ON
+CEGUI_CONF_OPTS += -DCEGUI_HAS_FREETYPE=ON
 else
-CEGUI_CONF_OTPS += -DCEGUI_HAS_FREETYPE=OFF
+CEGUI_CONF_OPTS += -DCEGUI_HAS_FREETYPE=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_MINIZIP),y)
 CEGUI_DEPENDENCIES += minizip
-CEGUI_CONF_OTPS += -DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=ON
+CEGUI_CONF_OPTS += -DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=ON
 else
-CEGUI_CONF_OTPS += -DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=OFF
+CEGUI_CONF_OPTS += -DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_XERCES),y)
 CEGUI_DEPENDENCIES += xerces
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_XERCES=ON
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_XERCES=ON
 else
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_XERCES=OFF
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_XERCES=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_LIBXML2),y)
 CEGUI_DEPENDENCIES += libxml2
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_LIBXML2=ON
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_LIBXML2=ON
 else
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_LIBXML2=OFF
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_LIBXML2=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_RAPIDXML),y)
 CEGUI_DEPENDENCIES += rapidxml
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_RAPIDXML=ON
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_RAPIDXML=ON
 else
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_RAPIDXML=OFF
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_RAPIDXML=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_TINYXML),y)
 CEGUI_DEPENDENCIES += tinyxml
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_TINYXML=ON
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_TINYXML=ON
 else
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_TINYXML=OFF
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_TINYXML=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_TINYXML2),y)
 CEGUI_DEPENDENCIES += tinyxml2
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_TINYXML2=ON
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_TINYXML2=ON
 else
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_TINYXML2=OFF
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_TINYXML2=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_LIBFREEIMAGE),y)
 CEGUI_DEPENDENCIES += libfreeimage
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=ON
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=ON
 else
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=OFF
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=OFF
 endif
 
 $(eval $(cmake-package))
Signature · 1 line
2.26.0
#1 lore raw

PATCH 2/2 package/cegui: disable xerces support

Disable temporarily xerces's support due to used char16_t type which is not supported in the currently used cegui version (0-8-7) due to forced c++03 standard.

Fixes:
- http://autobuild.buildroot.net/results/ea04be78b31b3409801597fc0ebe04627742c0c8
- http://autobuild.buildroot.net/results/7de3a07c304e3939ec9fd164328d004a5a9bba6d
- http://autobuild.buildroot.net/results/472b4e8438c9100e06e401296f0417a463e5fcf1

---
 package/cegui/cegui.mk | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
package/cegui/cegui.mk +1 -7
index 9a15511816..89b662f153 100644
@@ -9,6 +9,7 @@ CEGUI_SITE = $(call github,cegui,cegui,v$(CEGUI_VERSION))
 CEGUI_LICENSE = MIT
 CEGUI_LICENSE_FILES = COPYING
 CEGUI_INSTALL_STAGING = YES
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_XERCES=OFF
 CEGUI_DEPENDENCIES = glm \
 		$(if $(BR2_PACKAGE_LIBGLFW),libglfw) \
 		$(if $(BR2_PACKAGE_HAS_LIBGL),libgl) \
@@ -72,13 +73,6 @@ else
 CEGUI_CONF_OPTS += -DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=OFF
 endif
 
-ifeq ($(BR2_PACKAGE_XERCES),y)
-CEGUI_DEPENDENCIES += xerces
-CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_XERCES=ON
-else
-CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_XERCES=OFF
-endif
-
 ifeq ($(BR2_PACKAGE_LIBXML2),y)
 CEGUI_DEPENDENCIES += libxml2
 CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_LIBXML2=ON
Signature · 1 line
2.26.0
#2 lore raw

PATCH 1/2 package/cegui/cegui.mk: fix typos

In reply to Bartosz Bilas

Bartosz, All,

On 2020-04-04 18:51 +0200, Bartosz Bilas spake thusly:

Quoted 3 lines

Configure options should be passed via CONF_OPTS not CONF_OTPS.

You missed the epoxy case, so I also fixed it, and pushed to master. Thanks.

Regards,
Yann E. MORIN.

Quoted 135 lines
---
 package/cegui/cegui.mk | 52 +++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 26 deletions(-)
package/cegui/cegui.mk +26 -26
index 657492a7f7..9a15511816 100644
@@ -25,93 +25,93 @@ endif
 
 ifeq ($(BR2_PACKAGE_OGRE),y)
 CEGUI_DEPENDENCIES += ogre
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_RENDERER_OGRE=ON
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_RENDERER_OGRE=ON
 else
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_RENDERER_OGRE=OFF
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_RENDERER_OGRE=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_EXPAT),y)
 CEGUI_DEPENDENCIES += expat
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_EXPAT=ON
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_EXPAT=ON
 else
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_EXPAT=OFF
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_EXPAT=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_IRRLICHT),y)
 CEGUI_DEPENDENCIES += irrlicht
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_RENDERER_IRRLICHT=ON
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_RENDERER_IRRLICHT=ON
 else
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_RENDERER_IRRLICHT=OFF
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_RENDERER_IRRLICHT=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_SDL2)$(BR2_PACKAGE_SDL2_IMAGE),yy)
 CEGUI_DEPENDENCIES += sdl2 sdl2_image
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_IMAGECODEC_SDL2=ON
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_IMAGECODEC_SDL2=ON
 else
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_IMAGECODEC_SDL2=OFF
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_IMAGECODEC_SDL2=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_PCRE),y)
 CEGUI_DEPENDENCIES += pcre
-CEGUI_CONF_OTPS += -DCEGUI_HAS_PCRE_REGEX=ON
+CEGUI_CONF_OPTS += -DCEGUI_HAS_PCRE_REGEX=ON
 else
-CEGUI_CONF_OTPS += -DCEGUI_HAS_PCRE_REGEX=OFF
+CEGUI_CONF_OPTS += -DCEGUI_HAS_PCRE_REGEX=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_FREETYPE),y)
 CEGUI_DEPENDENCIES += freetype
-CEGUI_CONF_OTPS += -DCEGUI_HAS_FREETYPE=ON
+CEGUI_CONF_OPTS += -DCEGUI_HAS_FREETYPE=ON
 else
-CEGUI_CONF_OTPS += -DCEGUI_HAS_FREETYPE=OFF
+CEGUI_CONF_OPTS += -DCEGUI_HAS_FREETYPE=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_MINIZIP),y)
 CEGUI_DEPENDENCIES += minizip
-CEGUI_CONF_OTPS += -DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=ON
+CEGUI_CONF_OPTS += -DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=ON
 else
-CEGUI_CONF_OTPS += -DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=OFF
+CEGUI_CONF_OPTS += -DCEGUI_HAS_MINIZIP_RESOURCE_PROVIDER=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_XERCES),y)
 CEGUI_DEPENDENCIES += xerces
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_XERCES=ON
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_XERCES=ON
 else
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_XERCES=OFF
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_XERCES=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_LIBXML2),y)
 CEGUI_DEPENDENCIES += libxml2
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_LIBXML2=ON
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_LIBXML2=ON
 else
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_LIBXML2=OFF
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_LIBXML2=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_RAPIDXML),y)
 CEGUI_DEPENDENCIES += rapidxml
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_RAPIDXML=ON
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_RAPIDXML=ON
 else
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_RAPIDXML=OFF
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_RAPIDXML=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_TINYXML),y)
 CEGUI_DEPENDENCIES += tinyxml
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_TINYXML=ON
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_TINYXML=ON
 else
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_TINYXML=OFF
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_TINYXML=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_TINYXML2),y)
 CEGUI_DEPENDENCIES += tinyxml2
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_TINYXML2=ON
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_TINYXML2=ON
 else
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_XMLPARSER_TINYXML2=OFF
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_XMLPARSER_TINYXML2=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_LIBFREEIMAGE),y)
 CEGUI_DEPENDENCIES += libfreeimage
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=ON
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=ON
 else
-CEGUI_CONF_OTPS += -DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=OFF
+CEGUI_CONF_OPTS += -DCEGUI_BUILD_IMAGECODEC_FREEIMAGE=OFF
 endif
 
 $(eval $(cmake-package))
Signature · 6 lines
2.26.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'