Package: ocp Version: 1:0.1.21-1.3 Followup-For: Bug #848916 User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu artful ubuntu-patch
Control: tags -1 patch I've applied the attached patch to ocp in Ubuntu which allows ocp to build on i386 by disabling the use of i386 assembly. Hand-optimized assembly is mostly not interesting on i386, and the comment in the code indicates that this is 32-bit only assembly which means it's almost certainly less efficient on amd64 than whatever the compiler would come up with. -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer http://www.debian.org/ slanga...@ubuntu.com vor...@debian.org
diff -Nru ocp-0.1.21/debian/patches/no-i386-asm.patch ocp-0.1.21/debian/patches/no-i386-asm.patch --- ocp-0.1.21/debian/patches/no-i386-asm.patch 1969-12-31 16:00:00.000000000 -0800 +++ ocp-0.1.21/debian/patches/no-i386-asm.patch 2017-09-10 15:42:04.000000000 -0700 @@ -0,0 +1,21 @@ +Description: Don't try to use hand-coded assembly on i386 + The assembly doesn't work with current toolchains, and i386 hand-optimized + assembly is not a particularly interesting target. +Author: Steve Langasek <steve.langa...@ubuntu.com> +Bug-Debian: https://bugs.debian.org/848916 + +Index: ocp-0.1.21/config.h.in +=================================================================== +--- ocp-0.1.21.orig/config.h.in ++++ ocp-0.1.21/config.h.in +@@ -132,10 +132,6 @@ + + #undef HAVE_RESIZETERM + +-#if (defined(_X86) || defined(__i386__)) && !defined(__APPLE__) +-#define I386_ASM 1 +-#endif +- + /* #define I386_ASM_EMU 1 */ + + /* #define ZIP_DEBUG */ diff -Nru ocp-0.1.21/debian/patches/series ocp-0.1.21/debian/patches/series --- ocp-0.1.21/debian/patches/series 2016-12-18 13:49:58.000000000 -0800 +++ ocp-0.1.21/debian/patches/series 2017-09-10 15:40:39.000000000 -0700 @@ -2,3 +2,4 @@ fix-desktop-file fix-gcc47-pcthunk gccver.diff +no-i386-asm.patch
