Annotation of /trunk/cyrus-sasl/patches/cyrus-sasl-2.1.26-ld_as_needed.patch
Parent Directory
| 
Revision Log
Revision 2412 -
(hide annotations)
(download)
Mon Mar 3 14:45:58 2014 UTC (10 years, 3 months ago) by niro
File size: 1083 byte(s)
Mon Mar 3 14:45:58 2014 UTC (10 years, 3 months ago) by niro
File size: 1083 byte(s)
-patches for cyrus-sasl-2.1.26
| 1 | niro | 2412 | Author: Matthias Klose <doko@ubuntu.com> |
| 2 | Desription: Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use | ||
| 3 | it. | ||
| 4 | --- a/saslauthd/Makefile.am | ||
| 5 | +++ b/saslauthd/Makefile.am | ||
| 6 | @@ -16,7 +16,7 @@ EXTRA_saslauthd_sources = getaddrinfo.c | ||
| 7 | saslauthd_DEPENDENCIES = saslauthd-main.o @LTLIBOBJS@ | ||
| 8 | saslauthd_LDADD = @SASL_KRB_LIB@ \ | ||
| 9 | @GSSAPIBASE_LIBS@ @GSSAPI_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \ | ||
| 10 | - @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@ | ||
| 11 | + @LIB_SOCKET@ ../sasldb/libsasldb.la @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@ | ||
| 12 | |||
| 13 | testsaslauthd_SOURCES = testsaslauthd.c utils.c | ||
| 14 | testsaslauthd_LDADD = @LIB_SOCKET@ | ||
| 15 | --- a/sasldb/Makefile.am | ||
| 16 | +++ b/sasldb/Makefile.am | ||
| 17 | @@ -55,8 +55,8 @@ noinst_LIBRARIES = libsasldb.a | ||
| 18 | |||
| 19 | libsasldb_la_SOURCES = allockey.c sasldb.h | ||
| 20 | EXTRA_libsasldb_la_SOURCES = $(extra_common_sources) | ||
| 21 | -libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) | ||
| 22 | -libsasldb_la_LIBADD = $(SASL_DB_BACKEND) | ||
| 23 | +libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) $(SASL_DB_LIB) | ||
| 24 | +libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB) | ||
| 25 | |||
| 26 | # Prevent make dist stupidity | ||
| 27 | libsasldb_a_SOURCES = |