Skip to contentSkip to conversation

toolchain/external:: Fix gdbserver install with linaro 2015.08

PATCH Superseded Trent Piepho 3 participants 5 messages Nov 5, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 toolchain/external:: Fix gdbserver install with linaro 2015.08

It's now in bin/gdbserver from the install dir of the toolchain.

---
 toolchain/toolchain-external/toolchain-external.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
toolchain/toolchain-external/toolchain-external.mk +1 -1
index 958ab18..843b1f8 100644
@@ -645,7 +645,7 @@ define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LIBS
 	if test "$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY)" = "y"; then \
 		$(call MESSAGE,"Copying gdbserver") ; \
 		gdbserver_found=0 ; \
-		for d in $${ARCH_SYSROOT_DIR}/usr $${ARCH_SYSROOT_DIR}/../debug-root/usr $${ARCH_SYSROOT_DIR}/usr/$${ARCH_LIB_DIR} ; do \
+		for d in $${ARCH_SYSROOT_DIR}/usr $${ARCH_SYSROOT_DIR}/../debug-root/usr $${ARCH_SYSROOT_DIR}/usr/$${ARCH_LIB_DIR} ${TOOLCHAIN_EXTERNAL_INSTALL_DIR}; do \
 			if test -f $${d}/bin/gdbserver ; then \
 				install -m 0755 -D $${d}/bin/gdbserver $(TARGET_DIR)/usr/bin/gdbserver ; \
 				gdbserver_found=1 ; \
Signature · 1 line
1.8.3.1
#1 lore raw

PATCH 1/1 toolchain/external:: Fix gdbserver install with linaro 2015.08

Trent, All,

On 2015-11-05 19:45 +0000, Trent Piepho spake thusly:

Quoted 1 line

It's now in bin/gdbserver from the install dir of the toolchain.

Indeed...

Quoted 10 lines
---
 toolchain/toolchain-external/toolchain-external.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
toolchain/toolchain-external/toolchain-external.mk +0 -0
index 958ab18..843b1f8 100644

toolchain/toolchain-external/toolchain-external.mk define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LIBS · line 648

Quoted 5 lines
toolchain/toolchain-external/toolchain-external.mk +1 -1
@@ -645,7 +645,7 @@ define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LIBS
 	if test "$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY)" = "y"; then \
 		$(call MESSAGE,"Copying gdbserver") ; \
 		gdbserver_found=0 ; \
-		for d in $${ARCH_SYSROOT_DIR}/usr $${ARCH_SYSROOT_DIR}/../debug-root/usr $${ARCH_SYSROOT_DIR}/usr/$${ARCH_LIB_DIR} ; do \
+		for d in $${ARCH_SYSROOT_DIR}/usr $${ARCH_SYSROOT_DIR}/../debug-root/usr $${ARCH_SYSROOT_DIR}/usr/$${ARCH_LIB_DIR} ${TOOLCHAIN_EXTERNAL_INSTALL_DIR}; do \

It might be time to split this overly-long line, like so:

        for d in $${ARCH_SYSROOT_DIR}/usr \
                 $${ARCH_SYSROOT_DIR}/../debug-root/usr \
                 $${ARCH_SYSROOT_DIR}/usr/$${ARCH_LIB_DIR} \
                 ${TOOLCHAIN_EXTERNAL_INSTALL_DIR}; do \

Also, we use the $(FOO) construct when refering to Makefile variables, and TOOLCHAIN_EXTERNAL_INSTALL_DIR *is* a Makefile variable. Care to fix and respin, please?

Thank you! :-)

Regards,
Yann E. MORIN.

Quoted 11 lines
toolchain/toolchain-external/toolchain-external.mk +0 -0
 			if test -f $${d}/bin/gdbserver ; then \
 				install -m 0755 -D $${d}/bin/gdbserver $(TARGET_DIR)/usr/bin/gdbserver ; \
 				gdbserver_found=1 ; \
Signature · 7 lines
1.8.3.1


_______________________________________________
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 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH v2 1/1 toolchain/external:: Fix gdbserver install with linaro 2015.08

It's now in bin/gdbserver from the install dir of the toolchain.

---
 toolchain/toolchain-external/toolchain-external.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
toolchain/toolchain-external/toolchain-external.mk +4 -1
index 958ab18..613ce50 100644
@@ -645,7 +645,10 @@ define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LIBS
 	if test "$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY)" = "y"; then \
 		$(call MESSAGE,"Copying gdbserver") ; \
 		gdbserver_found=0 ; \
-		for d in $${ARCH_SYSROOT_DIR}/usr $${ARCH_SYSROOT_DIR}/../debug-root/usr $${ARCH_SYSROOT_DIR}/usr/$${ARCH_LIB_DIR} ; do \
+		for d in $${ARCH_SYSROOT_DIR}/usr \
+			 $${ARCH_SYSROOT_DIR}/../debug-root/usr \
+			 $${ARCH_SYSROOT_DIR}/usr/$${ARCH_LIB_DIR} \
+			 $(TOOLCHAIN_EXTERNAL_INSTALL_DIR); do \
 			if test -f $${d}/bin/gdbserver ; then \
 				install -m 0755 -D $${d}/bin/gdbserver $(TARGET_DIR)/usr/bin/gdbserver ; \
 				gdbserver_found=1 ; \
Signature · 1 line
1.8.3.1
#3 lore raw

PATCH v2 1/1 toolchain/external:: Fix gdbserver install with linaro 2015.08

Trent, All,

On 2015-11-05 20:12 +0000, Trent Piepho spake thusly:

Quoted 1 line

It's now in bin/gdbserver from the install dir of the toolchain.

You could have said:

In the latest Linaro toolchain, the gdbserver has moved (surprise!) and is now located side-by-side with the toolchain executables.

And this path as a new location where to search for a gdbserver.

Note: wrapping the long line at the same time.

;-)

Quoted 1 line

Otherwise:

Regards,
Yann E. MORIN.

Quoted 24 lines
---
 toolchain/toolchain-external/toolchain-external.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
toolchain/toolchain-external/toolchain-external.mk +4 -1
index 958ab18..613ce50 100644
@@ -645,7 +645,10 @@ define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LIBS
 	if test "$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY)" = "y"; then \
 		$(call MESSAGE,"Copying gdbserver") ; \
 		gdbserver_found=0 ; \
-		for d in $${ARCH_SYSROOT_DIR}/usr $${ARCH_SYSROOT_DIR}/../debug-root/usr $${ARCH_SYSROOT_DIR}/usr/$${ARCH_LIB_DIR} ; do \
+		for d in $${ARCH_SYSROOT_DIR}/usr \
+			 $${ARCH_SYSROOT_DIR}/../debug-root/usr \
+			 $${ARCH_SYSROOT_DIR}/usr/$${ARCH_LIB_DIR} \
+			 $(TOOLCHAIN_EXTERNAL_INSTALL_DIR); do \
 			if test -f $${d}/bin/gdbserver ; then \
 				install -m 0755 -D $${d}/bin/gdbserver $(TARGET_DIR)/usr/bin/gdbserver ; \
 				gdbserver_found=1 ; \
Signature · 1 line
1.8.3.1
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.  |
'------------------------------^-------^------------------^--------------------'
#4 lore raw

PATCH v2 1/1 toolchain/external:: Fix gdbserver install with linaro 2015.08

In reply to Trent Piepho

Dear Trent Piepho,

Quoted 6 lines · Trent Piepho

It's now in bin/gdbserver from the install dir of the toolchain.

---
 toolchain/toolchain-external/toolchain-external.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Applied after tweaking the commit title and commit log, in part using the suggestion from Yann E. Morin.

See:

http://git.buildroot.net/buildroot/commit/?id=d7a92aa2fbe1cfd13c8d0bf7c7942b2ead747ffe

for the final commit.

Thanks a lot for this contribution!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com