diff options
| author | Justin Patrin <papercrane@gmail.com> | 2006-09-11 22:59:53 +0000 |
|---|---|---|
| committer | Justin Patrin <papercrane@gmail.com> | 2006-09-11 22:59:53 +0000 |
| commit | 1a6abbb7d365528938af5cd7a6648773cde6169b (patch) | |
| tree | c757aadcbda10253987455ba6946c411dc221554 | |
| parent | a8b466f1f70b9ca6b549469b4dc3f27413e68436 (diff) | |
| parent | 076bbaabaef51d0434e5c81e4bf3033cad1aa77c (diff) | |
merge of '4b5876260ca7de97ddf57046863ff17cf59f9346'
and 'df35446baef7d0a7c0873c1be6afed6f313c9415'
| -rw-r--r-- | packages/gnupg/gnupg-1.4.2.2/30_nm_always_check.patch | 21 | ||||
| -rw-r--r-- | packages/gnupg/gnupg_1.4.2.2.bb | 3 | ||||
| -rw-r--r-- | site/i486-linux | 3 | ||||
| -rw-r--r-- | site/i586-linux | 3 | ||||
| -rw-r--r-- | site/sh4-linux | 3 | ||||
| -rw-r--r-- | site/sh4-linux-uclibc | 3 |
6 files changed, 35 insertions, 1 deletions
diff --git a/packages/gnupg/gnupg-1.4.2.2/30_nm_always_check.patch b/packages/gnupg/gnupg-1.4.2.2/30_nm_always_check.patch new file mode 100644 index 0000000000..914f1475b7 --- /dev/null +++ b/packages/gnupg/gnupg-1.4.2.2/30_nm_always_check.patch @@ -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 + diff --git a/packages/gnupg/gnupg_1.4.2.2.bb b/packages/gnupg/gnupg_1.4.2.2.bb index 97c301cf97..703aec379b 100644 --- a/packages/gnupg/gnupg_1.4.2.2.bb +++ b/packages/gnupg/gnupg_1.4.2.2.bb @@ -6,7 +6,8 @@ EXTRA_OECONF += "--with-readline=${STAGING_LIBDIR}/.." 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}" diff --git a/site/i486-linux b/site/i486-linux index c21dfcd365..41516d0671 100644 --- a/site/i486-linux +++ b/site/i486-linux @@ -125,6 +125,9 @@ jm_cv_func_working_readdir=yes # cvs cvs_cv_func_printf_ptr=${cvs_cv_func_printf_ptr=yes} +# rp-pppoe +rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev} + # gettext am_cv_func_working_getline=${am_cv_func_working_getline=yes} diff --git a/site/i586-linux b/site/i586-linux index 1be379c993..1f0e4f7b4f 100644 --- a/site/i586-linux +++ b/site/i586-linux @@ -107,6 +107,9 @@ ac_cv_have_openpty_ctty_bug=${ac_cv_have_openpty_ctty_bug=yes} # samba samba_cv_HAVE_GETTIMEOFDAY_TZ=${samba_cv_HAVE_GETTIMEOFDAY_TZ=yes} +# rp-pppoe +rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev} + # gettext am_cv_func_working_getline=${am_cv_func_working_getline=yes} diff --git a/site/sh4-linux b/site/sh4-linux index 8e25cad4a5..bb0bf09e6c 100644 --- a/site/sh4-linux +++ b/site/sh4-linux @@ -250,6 +250,9 @@ mysql_cv_func_atomic_sub=${mysql_cv_func_atomic_sub=no} mysql_cv_func_atomic_add=${mysql_cv_func_atomic_add=no} ac_cv_conv_longlong_to_float=${ac_cv_conv_longlong_to_float=yes} +# rp-pppoe +rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev} + # gettext am_cv_func_working_getline=${am_cv_func_working_getline=yes} diff --git a/site/sh4-linux-uclibc b/site/sh4-linux-uclibc index 30054561f2..c083f418b5 100644 --- a/site/sh4-linux-uclibc +++ b/site/sh4-linux-uclibc @@ -3,6 +3,9 @@ ac_cv_func_realloc_0_nonnull=${ac_cv_func_realloc_0_nonnull=yes} ac_cv_func_malloc_works=${ac_cv_func_malloc_works=yes} ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes} +# rp-pppoe +rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev} + # gettext am_cv_func_working_getline=${am_cv_func_working_getline=yes} |