Skip to contentSkip to conversation

openocd: fix build on older hosts

PATCH New Michael Walle 2 participants 4 messages Feb 28, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 openocd: fix build on older hosts

OpenOCD fails to generate the documentation because older host systems may have an old texinfo.

This patch is taken from upstream commit 79fdeb37f486f74658f1 which is included in version 0.10.0. Therefore, it can be dropped when the version is bumped.

---
Please include this patch in the 2017.02 release. Without the patch, openocd won't build on older build hosts. There is no functional change.

 ...-it-compatible-with-ancient-texinfo-versi.patch | 47 ++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 package/openocd/0003-manual-make-it-compatible-with-ancient-texinfo-versi.patch
package/openocd/0003-manual-make-it-compatible-with-ancient-texinfo-versi.patch new file +47 -0
new file mode 100644
index 0000000..01eddd2
@@ -0,0 +1,47 @@
+From 79fdeb37f486f74658f1eaf658abac8efb3eba6a Mon Sep 17 00:00:00 2001
+From: Paul Fertser <[email protected]>
+Date: Mon, 25 May 2015 11:59:25 +0300
+Subject: [PATCH] manual: make it compatible with ancient texinfo versions that
+ lack @raggedright
+
+This is needed to unbreak build on systems that ship texinfo version
+4.x.
+
+Change-Id: Ie665d29b02bb65da7e8ed0d48d17fa56e231bd0d
+Signed-off-by: Paul Fertser <[email protected]>
+Reviewed-on: http://openocd.zylin.com/2781
+Tested-by: jenkins
+Reviewed-by: David Ung <[email protected]>
+Reviewed-by: Spencer Oliver <[email protected]>
+Reviewed-by: Oleksij Rempel
+---
+ doc/openocd.texi | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/doc/openocd.texi b/doc/openocd.texi
+index 511bc6c..0208fcf 100644
+--- a/doc/openocd.texi
++++ b/doc/openocd.texi
+@@ -8460,11 +8460,17 @@ Cyg_Thread::thread_list, Cyg_Scheduler_Base::current_thread.
+ @item ThreadX symbols
+ _tx_thread_current_ptr, _tx_thread_created_ptr, _tx_thread_created_count.
+ @item FreeRTOS symbols
+- at raggedright
++ at c The following is taken from recent texinfo to provide compatibility
++ at c with ancient versions that do not support @raggedright
++ at tex
++\begingroup
++\rightskip0pt plus2em \spaceskip.3333em \xspaceskip.5em\relax
+ pxCurrentTCB, pxReadyTasksLists, xDelayedTaskList1, xDelayedTaskList2,
+ pxDelayedTaskList, pxOverflowDelayedTaskList, xPendingReadyList,
+ uxCurrentNumberOfTasks, uxTopUsedPriority.
+- at end raggedright
++\par
++\endgroup
++ at end tex
+ @item linux symbols
+ init_task.
+ @item ChibiOS symbols
+-- 
+2.1.4
+
Signature · 1 line
2.1.4
#1 lore raw

PATCH 1/1 openocd: fix build on older hosts

Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Michael" == Michael Walle <[email protected]> writes:

OpenOCD fails to generate the documentation because older host systems may have an old texinfo.

Quoted 8 lines

This patch is taken from upstream commit 79fdeb37f486f74658f1 which is included in version 0.10.0. Therefore, it can be dropped when the version is bumped.

---
Please include this patch in the 2017.02 release. Without the patch, openocd won't build on older build hosts. There is no functional change.

It would IMHO be better to not generate the documentation in the first place. I've committed Thomas' timestamp workaround, so it should no longer get generated:

https://patchwork.ozlabs.org/patch/732614/

Can you please verify that the above fixes it for you?

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

PATCH 1/1 openocd: fix build on older hosts

Hi,

Am 2017-02-28 09:56, schrieb Peter Korsgaard:

Quoted 18 lines
Quoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Michael" == Michael Walle <[email protected]> writes:

OpenOCD fails to generate the documentation because older host

systems may

Quoted 3 lines

have an old texinfo.

This patch is taken from upstream commit 79fdeb37f486f74658f1 which

is

Quoted 1 line

included in version 0.10.0. Therefore, it can be dropped when the

version

Quoted 6 lines

is bumped.

---
Please include this patch in the 2017.02 release. Without the patch, openocd won't build on older build hosts. There is no functional

change.

Quoted 7 lines

It would IMHO be better to not generate the documentation in the first place. I've committed Thomas' timestamp workaround, so it should no longer get generated:

https://patchwork.ozlabs.org/patch/732614/

Can you please verify that the above fixes it for you?

works for me. So drop my patch ;)

-michael

#3 lore raw

PATCH 1/1 openocd: fix build on older hosts

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Michael" == Michael Walle <[email protected]> writes:

Hi,

Quoted 5 lines
Quoted 3 lines

https://patchwork.ozlabs.org/patch/732614/

Can you please verify that the above fixes it for you?

works for me. So drop my patch ;)

Great, thanks - I've marked it as superseeded in patchwork.

Signature · 1 line
Bye, Peter Korsgaard