Skip to contentSkip to conversation

Fix fallout after hack to disable C++

PATCH New Yann E. MORIN 2 participants 5 messages Mar 31, 2018

lore
Share & tools
lore
#0 lore raw

cover Fix fallout after hack to disable C++

Hello All!

This small series fixes the fallout in the two identified packages that suffered from the switch CXX from 'false' to 'no'.

Those packages (really, just jimtcl, but standalone and bundled in openocd), really wnat that the executable exists. So we point it back to 'false'.

Regards,
Yann E. MORIN.

The following changes since commit 9b2f6548f8d2cad52fd3a5f81febf4818ee66304

zstd: fix legal info (2018-03-30 22:02:03 +0200)

are available in the git repository at:

git://git.buildroot.org/~ymorin/git/buildroot.git

for you to fetch changes up to 8162669309357bfbd684960e225b215ccd2abec1

package/openocd: fix fallout after no-C++ fixups (2018-03-31 09:17:25 +0200)

----------------------------------------------------------------
Yann E. MORIN (2):
package/jimtcl: fix fallout after no-C++ fixups package/openocd: fix fallout after no-C++ fixups

 package/jimtcl/jimtcl.mk   | 6 +++++-
 package/openocd/openocd.mk | 7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)
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.  |
'------------------------------^-------^------------------^--------------------'
#1 lore raw

PATCH 1/2 package/jimtcl: fix fallout after no-C++ fixups

Commit 4cd1ab158 (core: alternate solution to disable C++) made use of a non-existent 'no' binary when C++ is not available in the toolchain.

However, some packages, like jimtcl, really want to find the binary that $CXX contains.

Revert jimtcl to use 'false' instead of 'no'.

Fixes:

    http://autobuild.buildroot.org/results/54f/54f3df03551fbdf293d33dc1e3f08005faa15321/
---
 package/jimtcl/jimtcl.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
package/jimtcl/jimtcl.mk +5 -1
index 68c8a914db..389a72ab83 100644
@@ -44,9 +44,13 @@ endif
 # pkg-autotools.mk
 JIMTCL_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK
 
+# jimtcl really wants to find a existing $CXX, so feed it false
+# when we do not have one.
 define JIMTCL_CONFIGURE_CMDS
 	(cd $(@D); \
-		$(TARGET_CONFIGURE_OPTS) CCACHE=none \
+		$(TARGET_CONFIGURE_OPTS) \
+		CCACHE=none \
+		$(if $(BR2_INSTALL_LIBSTDCPP),,CXX=false) \
 		./configure --prefix=/usr \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
Signature · 1 line
2.14.1
#2 lore raw

PATCH 1/2 package/jimtcl: fix fallout after no-C++ fixups

Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

Commit 4cd1ab158 (core: alternate solution to disable C++) made use of a non-existent 'no' binary when C++ is not available in the toolchain.

However, some packages, like jimtcl, really want to find the binary that $CXX contains.

Quoted 7 lines

Revert jimtcl to use 'false' instead of 'no'.

Fixes:

    http://autobuild.buildroot.org/results/54f/54f3df03551fbdf293d33dc1e3f08005faa15321/

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 2/2 package/openocd: fix fallout after no-C++ fixups

In reply to Yann E. MORIN

Commit 4cd1ab158 (core: alternate solution to disable C++) made use of a non-existent 'no' binary when C++ is not available in the toolchain.

However, some packages, like jimtcl as bundled in opeocd, really want to find the binary that $CXX contains.

Revert openocd to use 'false' instead of 'no'.

Fixes:

    http://autobuild.buildroot.org/results/cbd/cbd5ab97fb0659968ff628461130627cf1745955/
---
 package/openocd/openocd.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
package/openocd/openocd.mk +6 -1
index 9d2576ceeb..548d8b81a0 100644
@@ -11,7 +11,12 @@ OPENOCD_LICENSE = GPL-2.0+
 OPENOCD_LICENSE_FILES = COPYING
 # 0002-configure-enable-build-on-uclinux.patch patches configure.ac
 OPENOCD_AUTORECONF = YES
-OPENOCD_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99"
+
+# The bundled jimtcl really wants to find a existing $CXX, so feed it
+# false when we do not have one.
+OPENOCD_CONF_ENV = \
+	$(if $(BR2_INSTALL_LIBSTDCPP),,CXX=false) \
+	CFLAGS="$(TARGET_CFLAGS) -std=gnu99"
 
 OPENOCD_CONF_OPTS = \
 	--oldincludedir=$(STAGING_DIR)/usr/include \
Signature · 1 line
2.14.1
#4 lore raw

PATCH 2/2 package/openocd: fix fallout after no-C++ fixups

Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

Commit 4cd1ab158 (core: alternate solution to disable C++) made use of a non-existent 'no' binary when C++ is not available in the toolchain.

However, some packages, like jimtcl as bundled in opeocd, really want to find the binary that $CXX contains.

Quoted 7 lines

Revert openocd to use 'false' instead of 'no'.

Fixes:

    http://autobuild.buildroot.org/results/cbd/cbd5ab97fb0659968ff628461130627cf1745955/

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard