[bug-mailutils] redefined weak symbol mu_gsasl_module_data

[Jordi Mallach]

Hi again,

I had forgotten about a trivial patch from
Adam D. Barratt <address@hidden> which was applied to 2.0
in order to fix a build failure in MIPS:

> /bin/sh ../libtool --tag=CC   --mode=link cc  -g -O2 -g -Wall -O2   -o muauth 
> muauth.o ../libargp/libmuargp.a ../libcfg/libmucfg.la ../lib/libmuaux.la 
> ../auth/libmuauth.la -lgsasl -lgnutls -lgcrypt -lldap -lpam -ldl 
> ../mailbox/libmailutils.la -lcrypt -lresolv  -lpthread -lgdbm
> libtool: link: cc -g -O2 -g -Wall -O2 -o .libs/muauth muauth.o  
> ../libargp/libmuargp.a ../libcfg/.libs/libmucfg.so ../lib/.libs/libmuaux.a 
> ../auth/.libs/libmuauth.so -L/usr/lib -L/usr/local/lib/mysql 
> /build/buildd/mailutils-2.0+dfsg1/mailbox/.libs/libmailutils.so 
> /usr/lib/libmysqlclient.so -lnsl -lm /usr/lib/libgsasl.so /usr/lib/libidn.so 
> /usr/lib/libntlm.so -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err 
> /usr/lib/libgnutls.so /usr/lib/libtasn1.so -lz /usr/lib/libgcrypt.so 
> /usr/lib/libgpg-error.so -lldap -lpam -ldl ../mailbox/.libs/libmailutils.so 
> -lcrypt -lresolv -lpthread /usr/lib/libgdbm.so
> /usr/bin/ld: non-dynamic relocations refer to dynamic symbol 
> mu_gsasl_module_data
> /usr/bin/ld: failed to set dynamic section sizes: Bad value
> collect2: ld returned 1 exit status
> make[4]: *** [muauth] Error 1
> make[4]: Leaving directory `/build/buildd/mailutils-2.0+dfsg1/examples'

The following fixes a redefined weak symbol. Maybe Simon's post 2.1 changes to
the gsasl code fixes this in another way, but just in case, here's the patch,
which I hope to drop for 2.2. :)

--- mailutils-2.0+dfsg1.orig/include/mailutils/gsasl.h
+++ mailutils-2.0+dfsg1/include/mailutils/gsasl.h
@@ -30,7 +30,7 @@
 
 int mu_gsasl_module_init (enum mu_gocs_op, void *);
 
-struct mu_gsasl_module_data mu_gsasl_module_data;
+extern struct mu_gsasl_module_data mu_gsasl_module_data;
 
 #ifdef USE_GSASL
 #include <gsasl.h>

-- 
Jordi Mallach Pérez  --  Debian developer     http://www.debian.org/
address@hidden     address@hidden     http://www.sindominio.net/
GnuPG public key information available at http://oskuro.net/

signature.asc
Description: Digital signature