Skip to contentSkip to conversation

package/freerdp: needs wchar

PATCH Superseded Fabio Porcedda 2 participants 2 messages Feb 22, 2015

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/freerdp: needs wchar

Also add reverse dependency for Weston.

Fix build error:
make[3]: Entering directory '/home/tetsuya/buildroot/br/output/build/freerdp-b21ff842ef3de5837513042dc30488b12bd9cf9d'
In file included from /home/tetsuya/buildroot/br/output/build/freerdp-b21ff842ef3de5837513042dc30488b12bd9cf9d/winpr/include/winpr/winsock.h:24:0,

                 from /home/tetsuya/buildroot/br/output/build/freerdp-b21ff842ef3de5837513042dc30488b12bd9cf9d/winpr/libwinpr/winsock/winsock.c:24:

/home/tetsuya/buildroot/br/output/build/freerdp-b21ff842ef3de5837513042dc30488b12bd9cf9d/winpr/include/winpr/wtypes.h:132:1: error: unknown type name ?wchar_t?
typedef wchar_t UNICODE;

---
 package/freerdp/Config.in | 4 ++++
 package/weston/Config.in  | 4 ++++
 2 files changed, 8 insertions(+)
package/freerdp/Config.in +4 -0
index 1c203c7..e0a014a 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_FREERDP
 	bool "freerdp"
+	depends on BR2_USE_WCHAR
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_ZLIB
 	help
@@ -16,6 +17,9 @@ config BR2_PACKAGE_FREERDP
 	  suggested that you overwrite them with your own set,
 	  either in an overlay rootfs or in a post-build script.
 
+comment "freerdp needs a toolchain w/ wchar"
+	depends on !BR2_USE_WCHAR
+
 if BR2_PACKAGE_FREERDP
 
 config BR2_PACKAGE_FREERDP_SERVER
package/weston/Config.in +4 -0
index 8983460..dec3583 100644
@@ -41,6 +41,7 @@ config BR2_PACKAGE_WESTON_FBDEV
 
 config BR2_PACKAGE_WESTON_RDP
 	bool "RDP compositor"
+	depends on BR2_USE_WCHAR # freerdp
 	select BR2_PACKAGE_FREERDP
 	select BR2_PACKAGE_WESTON_HAS_COMPOSITOR
 	help
@@ -56,6 +57,9 @@ config BR2_PACKAGE_WESTON_RDP
 	  so you may want to change them in a post-build script or a rootfs
 	  overlay.
 
+comment "RDP compositor needs a toolchain w/ wchar"
+	depends on !BR2_USE_WCHAR
+
 # rpi-userland is an EGL/GLES provider, so we can't select it
 config BR2_PACKAGE_WESTON_RPI
 	bool "RPi compositor"
Signature · 1 line
2.3.0
#1 lore raw

PATCH 1/1 package/freerdp: needs wchar

Fabio, All,

On 2015-02-23 00:02 +0100, Fabio Porcedda spake thusly:

Quoted 27 lines

Also add reverse dependency for Weston.

Fix build error:
make[3]: Entering directory '/home/tetsuya/buildroot/br/output/build/freerdp-b21ff842ef3de5837513042dc30488b12bd9cf9d'
In file included from /home/tetsuya/buildroot/br/output/build/freerdp-b21ff842ef3de5837513042dc30488b12bd9cf9d/winpr/include/winpr/winsock.h:24:0,

                 from /home/tetsuya/buildroot/br/output/build/freerdp-b21ff842ef3de5837513042dc30488b12bd9cf9d/winpr/libwinpr/winsock/winsock.c:24:

/home/tetsuya/buildroot/br/output/build/freerdp-b21ff842ef3de5837513042dc30488b12bd9cf9d/winpr/include/winpr/wtypes.h:132:1: error: unknown type name ?wchar_t?
typedef wchar_t UNICODE;

---
 package/freerdp/Config.in | 4 ++++
 package/weston/Config.in  | 4 ++++
 2 files changed, 8 insertions(+)
package/freerdp/Config.in +1 -0
index 1c203c7..e0a014a 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_FREERDP
 	bool "freerdp"
+	depends on BR2_USE_WCHAR
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_ZLIB
 	help

package/freerdp/Config.in config BR2_PACKAGE_FREERDP · line 22

Quoted 6 lines
package/freerdp/Config.in +3 -0
@@ -16,6 +17,9 @@ config BR2_PACKAGE_FREERDP
 	  suggested that you overwrite them with your own set,
 	  either in an overlay rootfs or in a post-build script.
 
+comment "freerdp needs a toolchain w/ wchar"
+	depends on !BR2_USE_WCHAR
+

Please put the comment at the end of the file, otherwise the following options are not properly indented in the menuconfig.

Otherwise, looks good. With the above fixed, you can add my:

    Acked-by: "Yann E. MORIN" <[email protected]>

Thanks for fixing this wchar breakage! :-)

Regards,
Yann E. MORIN.

Quoted 28 lines
package/freerdp/Config.in +0 -0
 if BR2_PACKAGE_FREERDP
 
 config BR2_PACKAGE_FREERDP_SERVER
package/weston/Config.in +4 -0
index 8983460..dec3583 100644
@@ -41,6 +41,7 @@ config BR2_PACKAGE_WESTON_FBDEV
 
 config BR2_PACKAGE_WESTON_RDP
 	bool "RDP compositor"
+	depends on BR2_USE_WCHAR # freerdp
 	select BR2_PACKAGE_FREERDP
 	select BR2_PACKAGE_WESTON_HAS_COMPOSITOR
 	help
@@ -56,6 +57,9 @@ config BR2_PACKAGE_WESTON_RDP
 	  so you may want to change them in a post-build script or a rootfs
 	  overlay.
 
+comment "RDP compositor needs a toolchain w/ wchar"
+	depends on !BR2_USE_WCHAR
+
 # rpi-userland is an EGL/GLES provider, so we can't select it
 config BR2_PACKAGE_WESTON_RPI
 	bool "RPi compositor"
Signature · 1 line
2.3.0
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'