[oe-commits] org.oe.dev gnupg 1.4.2.2: Fix for x86. The assembler code was being compiled

[lenehan commit]

gnupg 1.4.2.2: Fix for x86. The assembler code was being compiled
with underscores prefixed to the functions while the C code was not
expecting the underscores. This was caused by the configure script
assuming that _'s were required when cross-compiling. Turning off
assembler code via a configure option would have fixed this, but
instead I've modified the configure script to actually test for
underscores when cross-compiling - the test is just a compile + nm
which works fine when cross-compiling. Tested on i486, i586 and sh4.

Author: lenehan at openembedded.org
Branch: org.openembedded.dev
Revision: df35446baef7d0a7c0873c1be6afed6f313c9415
ViewMTN: http://monotone.openembedded.org/revision.psp?id=df35446baef7d0a7c0873c1be6afed6f313c9415
Files:
1
packages/gnupg/gnupg-1.4.2.2/30_nm_always_check.patch
packages/gnupg/gnupg_1.4.2.2.bb
Diffs:

#
# mt diff -rcf9ef45e338a7a51ee8646b8cdbbfaedb1e43e43 -rdf35446baef7d0a7c0873c1be6afed6f313c9415
#
# 
# 
# add_file "packages/gnupg/gnupg-1.4.2.2/30_nm_always_check.patch"
#  content [982f0c1ec59114d02ef36cd14c713418a3343ccf]
# 
# patch "packages/gnupg/gnupg_1.4.2.2.bb"
#  from [d08a8fc8aa7f5b713302388fa119aa85ddcdc281]
#    to [6d6aa04450ecd1884648ecca029917a9112c7e8d]
# 
============================================================
--- packages/gnupg/gnupg-1.4.2.2/30_nm_always_check.patch	982f0c1ec59114d02ef36cd14c713418a3343ccf
+++ packages/gnupg/gnupg-1.4.2.2/30_nm_always_check.patch	982f0c1ec59114d02ef36cd14c713418a3343ccf
@@ -0,0 +1,21 @@
+Originally the test for _'s on symbols was not done when cross-compiling and
+it was assumed that the _'s were appended. The test does in fact work since
+it simply compiles a file and then run's nm on it. So patch this to enable.
+Without this x86 targets fail during linking since the assembler code has
+the _'s appended when it shouldn't.
+
+--- gnupg-1.4.2.2/acinclude.m4	2006/09/11 22:11:23	1.1
++++ gnupg-1.4.2.2/acinclude.m4	2006/09/11 22:17:25
+@@ -673,11 +673,7 @@
+         ac_cv_sys_symbol_underscore=yes
+         ;;
+     *)
+-      if test "$cross_compiling" = yes; then
+-         ac_cv_sys_symbol_underscore=yes
+-      else
+-         tmp_do_check="yes"
+-      fi
++        tmp_do_check="yes"
+        ;;
+ esac
+ 
============================================================
--- packages/gnupg/gnupg_1.4.2.2.bb	d08a8fc8aa7f5b713302388fa119aa85ddcdc281
+++ packages/gnupg/gnupg_1.4.2.2.bb	6d6aa04450ecd1884648ecca029917a9112c7e8d
@@ -6,7 +6,8 @@ SRC_URI += "file://15_free_caps.patch;pa
 
 SRC_URI += "file://15_free_caps.patch;patch=1 \
 	    file://16_min_privileges.patch;patch=1 \
-	    file://22_zero_length_mpi_fix.patch;patch=1 "
+	    file://22_zero_length_mpi_fix.patch;patch=1 \
+            file://30_nm_always_check.patch;patch=1"
 
 S = "${WORKDIR}/gnupg-${PV}"