Rmys
28 lines
1.2 KiB
Diff
28 lines
1.2 KiB
Diff
https://github.com/cyrusimap/cyrus-sasl/commit/bca0a6dd3bb3d38040753ac412945ce704818863
|
|
|
|
From bca0a6dd3bb3d38040753ac412945ce704818863 Mon Sep 17 00:00:00 2001
|
|
From: Bastian Germann <bage@debian.org>
|
|
Date: Thu, 24 Mar 2016 11:35:03 +0100
|
|
Subject: [PATCH] Don't overwrite PIC objects with non-PIC variant
|
|
|
|
This patch makes sure the non-PIC version of libsasldb.a, which
|
|
is created out of non-PIC objects, is not going to overwrite the PIC version,
|
|
which is created out of PIC objects. The PIC version is placed in .libs, and
|
|
the non-PIC version in the current directory. This ensures that both non-PIC
|
|
and PIC versions are available in the correct locations.
|
|
|
|
Originally-by: Fabian Fagerholm <fabbe@debian.org>
|
|
Signed-off-by: Bastian Germann <bage@debian.org>
|
|
--- a/lib/Makefile.am
|
|
+++ b/lib/Makefile.am
|
|
@@ -99,7 +99,7 @@ endif
|
|
|
|
libsasl2.a: libsasl2.la $(SASL_STATIC_OBJS)
|
|
@echo adding static plugins and dependencies
|
|
- $(AR) cru .libs/$@ $(SASL_STATIC_OBJS)
|
|
+ $(AR) cru $@ $(SASL_STATIC_OBJS)
|
|
@for i in ./libsasl2.la ../common/libplugin_common.la ../sasldb/libsasldb.la ../plugins/lib*.la; do \
|
|
if test ! -f $$i; then continue; fi; . $$i; \
|
|
for j in $$dependency_libs foo; do \
|
|
|