| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 1 | From 1a5f3004e9081eab6263a29cd5be792f06441e36 Mon Sep 17 00:00:00 2001 |
| 2 | From: Fabian Fagerholm <fabbe@debian.org> |
| 3 | Date: Wed, 24 Jul 2013 11:38:25 -0400 |
| 4 | Subject: [PATCH] cyrus-sasl: Add patches from Debian to fix linking |
| 5 | |
| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 6 | Description: This patch makes sure the non-PIC version of libsasldb.a, which |
| 7 | is created out of non-PIC objects, is not going to overwrite the PIC version, |
| 8 | which is created out of PIC objects. The PIC version is placed in .libs, and |
| 9 | the non-PIC version in the current directory. This ensures that both non-PIC |
| 10 | and PIC versions are available in the correct locations. |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 11 | |
| 12 | --- |
| 13 | lib/Makefile.am | 2 +- |
| 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 15 | |
| 16 | diff --git a/lib/Makefile.am b/lib/Makefile.am |
| 17 | index a158ca3..3137e19 100644 |
| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 18 | --- a/lib/Makefile.am |
| 19 | +++ b/lib/Makefile.am |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 20 | @@ -99,7 +99,7 @@ endif |
| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 21 | |
| 22 | libsasl2.a: libsasl2.la $(SASL_STATIC_OBJS) |
| 23 | @echo adding static plugins and dependencies |
| 24 | - $(AR) cru .libs/$@ $(SASL_STATIC_OBJS) |
| 25 | + $(AR) cru $@ $(SASL_STATIC_OBJS) |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 26 | @for i in ./libsasl2.la ../common/libplugin_common.la ../sasldb/libsasldb.la ../plugins/lib*.la; do \ |
| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 27 | if test ! -f $$i; then continue; fi; . $$i; \ |
| 28 | for j in $$dependency_libs foo; do \ |