tags 683925 + pending thanks Dear maintainer,
I've prepared an NMU for ocp (versioned as 1:0.1.21-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Tracy Chapman: The Promise
diff -Nru ocp-0.1.21/debian/changelog ocp-0.1.21/debian/changelog --- ocp-0.1.21/debian/changelog 2011-12-01 15:47:00.000000000 +0100 +++ ocp-0.1.21/debian/changelog 2012-09-16 17:21:01.000000000 +0200 @@ -1,3 +1,13 @@ +ocp (1:0.1.21-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "FTBFS with gcc-4.7 on i386": add patch fix-gcc47-pcthunk from Kumar + Appaiah: Fix name of PIC thunks with gcc 4.7. + Thanks also to Felix Geyer for the bug report and for pointing to the fix. + (Closes: #683925) + + -- gregor herrmann <gre...@debian.org> Sun, 16 Sep 2012 17:19:22 +0200 + ocp (1:0.1.21-1) unstable; urgency=low * New upstream version. diff -Nru ocp-0.1.21/debian/patches/fix-gcc47-pcthunk ocp-0.1.21/debian/patches/fix-gcc47-pcthunk --- ocp-0.1.21/debian/patches/fix-gcc47-pcthunk 1970-01-01 01:00:00.000000000 +0100 +++ ocp-0.1.21/debian/patches/fix-gcc47-pcthunk 2012-09-16 17:19:05.000000000 +0200 @@ -0,0 +1,42 @@ +Description: Fix name of PIC thunks with gcc 4.7 +Origin: vendor +Bug-Debian: http://bugs.debian.org/683925 +Forwarded: no +Author: Kumar Appaiah <a.ku...@alumni.iitm.ac.in> +Reviewed-by: gregor herrmann <gre...@debian.org> +Last-Update: 2012-09-16 + +--- a/devw/dwmixfa_8087.c ++++ b/devw/dwmixfa_8087.c +@@ -171,7 +171,12 @@ + /* store pointer to dwmixfa_state into EBX. Non PIC code already has this in place from stub */ + "pushl %%ebx\n" + +- "call __i686.get_pc_thunk.bx\n" ++#if __GNUC_PREREQ (4, 7) ++# define GET_PC_THUNK_STR(reg) "__x86.get_pc_thunk." #reg ++#else ++# define GET_PC_THUNK_STR(reg) "__i686.get_pc_thunk." #reg ++#endif ++ "call " GET_PC_THUNK_STR(reg) " \n" + "addl $_GLOBAL_OFFSET_TABLE_, %%ebx\n" + "movl dwmixfa_state@GOT(%%ebx), %%ebx\n" + #endif +@@ -249,7 +254,7 @@ + ( + #ifdef __PIC__ + "pushl %%ebx\n" +- "call __i686.get_pc_thunk.bx\n" ++ "call " GET_PC_THUNK_STR(reg) "\n" + "addl $_GLOBAL_OFFSET_TABLE_, %%ebx\n" + "pushl %%ebx\n" + "movl dwmixfa_state@GOT(%%ebx), %%ebx\n" +@@ -2264,7 +2269,7 @@ + */ + #ifdef __PIC__ + "pushl %%ebx\n" +- "call __i686.get_pc_thunk.bx\n" ++ "call " GET_PC_THUNK_STR(reg) " \n" + "addl $_GLOBAL_OFFSET_TABLE_, %%ebx\n" + "movl dwmixfa_state@GOT(%%ebx), %%ebx\n" + #else diff -Nru ocp-0.1.21/debian/patches/series ocp-0.1.21/debian/patches/series --- ocp-0.1.21/debian/patches/series 2011-12-01 16:34:28.000000000 +0100 +++ ocp-0.1.21/debian/patches/series 2012-09-16 17:15:01.000000000 +0200 @@ -1,2 +1,3 @@ info-compression fix-desktop-file +fix-gcc47-pcthunk
signature.asc
Description: Digital signature
