Skip to contentSkip to conversation

usb_modeswitch: set CXX to false when C++ is missing

PATCH New Baruch Siach 3 participants 3 messages Apr 17, 2018 – May 1, 2018

lore
Share & tools
lore

Baruch Siach

author
#0 lore raw

PATCH 1/1 usb_modeswitch: set CXX to false when C++ is missing

Similar to the openocd fix in commit 5966e2dc54 (package/openocd: fix fallout after no-C++ fixups) the jimctl that is bundled with usb_modeswitch also wants to find a binary. This broke with commit 4cd1ab158 (core: alternate solution to disable C++). Revert to 'false' instead of 'no' here as well.

Fixes:
http://autobuild.buildroot.net/results/b4d/b4d4e925763cb6558af915f9781afe07fc557ebc/
http://autobuild.buildroot.net/results/61b/61b9dc2148df2e8fd0b30e62aedbfd30bb755e19/
http://autobuild.buildroot.net/results/468/468a7e6b049f159fbb4e79d3a12b53ca890f6933/

Cc "Yann E. MORIN" <[email protected]>
Signed-off-by Baruch Siach <[email protected]>

---
This fix is also applicable to the 2018.02.x branch.

---
 package/usb_modeswitch/usb_modeswitch.mk | 1 +
 1 file changed, 1 insertion(+)
package/usb_modeswitch/usb_modeswitch.mk +1 -0
index 8e6b433913a0..d0c33cc18715 100644
@@ -28,6 +28,7 @@ USB_MODESWITCH_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK
 
 define USB_MODESWITCH_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		$(if $(BR2_INSTALL_LIBSTDCPP),,CXX=false) \
 		CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE -Wall -I." \
 		JIM_CONFIGURE_OPTS="--host=$(GNU_TARGET_NAME) --build=$(GNU_HOST_NAME)" \
 		-C $(@D) $(USB_MODESWITCH_BUILD_TARGETS)
Signature · 1 line
2.17.0
Applied
#1 lore raw

PATCH 1/1 usb_modeswitch: set CXX to false when C++ is missing

Hello,

Quoted 11 lines · Baruch Siach

Similar to the openocd fix in commit 5966e2dc54 (package/openocd: fix fallout after no-C++ fixups) the jimctl that is bundled with usb_modeswitch also wants to find a binary. This broke with commit 4cd1ab158 (core: alternate solution to disable C++). Revert to 'false' instead of 'no' here as well.

Fixes:
http://autobuild.buildroot.net/results/b4d/b4d4e925763cb6558af915f9781afe07fc557ebc/
http://autobuild.buildroot.net/results/61b/61b9dc2148df2e8fd0b30e62aedbfd30bb755e19/
http://autobuild.buildroot.net/results/468/468a7e6b049f159fbb4e79d3a12b53ca890f6933/

Quoted 7 lines
Cc "Yann E. MORIN" <[email protected]>
Signed-off-by Baruch Siach <[email protected]>

---
This fix is also applicable to the 2018.02.x branch.

---
 package/usb_modeswitch/usb_modeswitch.mk | 1 +
 1 file changed, 1 insertion(+)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 usb_modeswitch: set CXX to false when C++ is missing

In reply to Baruch Siach
Quoted 13 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Baruch" == Baruch Siach <[email protected]> writes:

Similar to the openocd fix in commit 5966e2dc54 (package/openocd: fix fallout after no-C++ fixups) the jimctl that is bundled with usb_modeswitch also wants to find a binary. This broke with commit 4cd1ab158 (core: alternate solution to disable C++). Revert to 'false' instead of 'no' here as well.

Fixes:
http://autobuild.buildroot.net/results/b4d/b4d4e925763cb6558af915f9781afe07fc557ebc/
http://autobuild.buildroot.net/results/61b/61b9dc2148df2e8fd0b30e62aedbfd30bb755e19/
http://autobuild.buildroot.net/results/468/468a7e6b049f159fbb4e79d3a12b53ca890f6933/

Quoted 4 lines
Cc "Yann E. MORIN" <[email protected]>
Signed-off-by Baruch Siach <[email protected]>

---
This fix is also applicable to the 2018.02.x branch.

Committed to 2018.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard