| Message ID | 9c1fc72919be11ec00af92b2c0ba452d23f32144.1523937628.git.baruch@tkos.co.il |
|---|---|
| State | Accepted |
| Headers | show |
| Series | usb_modeswitch: set CXX to false when C++ is missing | expand |
Hello, On Tue, 17 Apr 2018 07:00:28 +0300, Baruch Siach wrote: > 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" <yann.morin.1998@free.fr> > Signed-off-by: Baruch Siach <baruch@tkos.co.il> > --- > 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
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> 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/ > Cc: "Yann E. MORIN" <yann.morin.1998@free.fr> > Signed-off-by: Baruch Siach <baruch@tkos.co.il> > --- > This fix is also applicable to the 2018.02.x branch. Committed to 2018.02.x, thanks.
diff --git a/package/usb_modeswitch/usb_modeswitch.mk b/package/usb_modeswitch/usb_modeswitch.mk index 8e6b433913a0..d0c33cc18715 100644 --- a/package/usb_modeswitch/usb_modeswitch.mk +++ b/package/usb_modeswitch/usb_modeswitch.mk @@ -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)
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" <yann.morin.1998@free.fr> Signed-off-by: Baruch Siach <baruch@tkos.co.il> --- This fix is also applicable to the 2018.02.x branch. --- package/usb_modeswitch/usb_modeswitch.mk | 1 + 1 file changed, 1 insertion(+)