Skip to contentSkip to conversation

poco: fix m68k compile

PATCH Superseded Waldemar Brodkorb 2 participants 2 messages Aug 11, 2016

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 poco: fix m68k compile

Add a patch from upstream to fix compile for m68k.

Fixes:
http://autobuild.buildroot.net/results/791917c1343f53e12f27b06cfd5e1d2e88078014/
http://autobuild.buildroot.net/results/349d4b49d65a652551c4de20233684bb4ffa5ae3/

---
 package/poco/0002-fix-m68k-double-conv-detect.patch | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 package/poco/0002-fix-m68k-double-conv-detect.patch
package/poco/0002-fix-m68k-double-conv-detect.patch new file +19 -0
new file mode 100644
index 0000000..465ee64
@@ -0,0 +1,19 @@
+Fixes compile for m68k.
+
+From upstream double-conversion:
+https://github.com/google/double-conversion/blob/master/double-conversion/utils.h#L81
+
+Signed-off-by: Waldemar Brodkorb <[email protected]>
+
+diff -Nur poco-poco-1.7.2-release.orig/Foundation/src/utils.h poco-poco-1.7.2-release/Foundation/src/utils.h
+--- poco-poco-1.7.2-release.orig/Foundation/src/utils.h	2016-03-19 08:19:35.000000000 +0100
++++ poco-poco-1.7.2-release/Foundation/src/utils.h	2016-08-11 02:55:02.827238119 +0200
+@@ -63,6 +63,8 @@
+     defined(__AARCH64EL__) || \
+     defined(nios2) || defined(__nios2) || defined(__nios2__)
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
++#elif defined(__mc68000__)
++#undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS
+ #elif defined(_M_IX86) || defined(__i386__) || defined(__i386)
+ #if defined(_WIN32)
+ // Windows uses a 64bit wide floating point stack.
Signature · 1 line
2.1.4
#1 lore raw

PATCH 1/1 poco: fix m68k compile

Hi Waldemar,

Quoted 1 line · Waldemar Brodkorb

Add a patch from upstream to fix compile for m68k.

That is a little misleading. The patch is from the upstream double-conversion project, not poco. poco apparently bundles code from double-conversion, so at some point in the future poco may include this fix. But this patch is to really (poco) upstream yet.

Quoted 16 lines

Fixes:
http://autobuild.buildroot.net/results/791917c1343f53e12f27b06cfd5e1d2e88078014/
http://autobuild.buildroot.net/results/349d4b49d65a652551c4de20233684bb4ffa5ae3/

---
 package/poco/0002-fix-m68k-double-conv-detect.patch | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 package/poco/0002-fix-m68k-double-conv-detect.patch
package/poco/0002-fix-m68k-double-conv-detect.patch new file +0 -0
new file mode 100644
index 0000000..465ee64

package/poco/0002-fix-m68k-double-conv-detect.patch line 4

Quoted 4 lines
package/poco/0002-fix-m68k-double-conv-detect.patch new file +4 -0
@@ -0,0 +1,19 @@
+Fixes compile for m68k.
+
+From upstream double-conversion:
+https://github.com/google/double-conversion/blob/master/double-conversion/utils.h#L81

Mentioning the double-conversion commit id for this patch (da111796231) would be nice. Besides, pointing to a specific line in a file on master branch is not future proof.

baruch

Quoted 15 lines
package/poco/0002-fix-m68k-double-conv-detect.patch new file +15 -0
+
+Signed-off-by: Waldemar Brodkorb <[email protected]>
+
+diff -Nur poco-poco-1.7.2-release.orig/Foundation/src/utils.h poco-poco-1.7.2-release/Foundation/src/utils.h
+--- poco-poco-1.7.2-release.orig/Foundation/src/utils.h	2016-03-19 08:19:35.000000000 +0100
++++ poco-poco-1.7.2-release/Foundation/src/utils.h	2016-08-11 02:55:02.827238119 +0200
+@@ -63,6 +63,8 @@
+     defined(__AARCH64EL__) || \
+     defined(nios2) || defined(__nios2) || defined(__nios2__)
+ #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
++#elif defined(__mc68000__)
++#undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS
+ #elif defined(_M_IX86) || defined(__i386__) || defined(__i386)
+ #if defined(_WIN32)
+ // Windows uses a 64bit wide floating point stack.
Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -