From 8ed87679259f2cb87d4a7449d4ff8533050e6ce7 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Thu, 5 Mar 2009 20:39:56 +0100
Subject: [PATCH] Removed unnecessary linker flags that break Solaris
 compilation.

---
 src/sieve-tools/Makefile.am |  8 ++++----
 src/testsuite/Makefile.am   | 10 ++--------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/sieve-tools/Makefile.am b/src/sieve-tools/Makefile.am
index 7cbc30106..705bbba00 100644
--- a/src/sieve-tools/Makefile.am
+++ b/src/sieve-tools/Makefile.am
@@ -12,10 +12,10 @@ AM_CPPFLAGS = \
 	-I$(dovecot_incdir)/src/lib-storage \
 	-I$(dovecot_incdir)/src/deliver
 
-#sievec_LDFLAGS = -export-dynamic -Wl,--start-group 
-#sieved_LDFLAGS = -export-dynamic -Wl,--start-group 
-#sieve_test_LDFLAGS = -export-dynamic -Wl,--start-group
-#sieve_filter_LDFLAGS = -export-dynamic -Wl,--start-group
+sievec_LDFLAGS = -export-dynamic 
+sieved_LDFLAGS = -export-dynamic 
+sieve_test_LDFLAGS = -export-dynamic
+sieve_filter_LDFLAGS = -export-dynamic
 
 libs = \
 	$(top_srcdir)/src/lib-sieve/libsieve.la \
diff --git a/src/testsuite/Makefile.am b/src/testsuite/Makefile.am
index fff2bc789..66050b5ab 100644
--- a/src/testsuite/Makefile.am
+++ b/src/testsuite/Makefile.am
@@ -9,20 +9,14 @@ AM_CPPFLAGS = \
 	-I$(dovecot_incdir)/src/lib-index \
 	-I$(dovecot_incdir)/src/lib-storage
 
-testsuite_LDFLAGS = -export-dynamic -Wl,--start-group 
+testsuite_LDFLAGS = -export-dynamic
 
 libs = \
 	$(top_srcdir)/src/lib-sieve/libsieve.la \
 	$(top_srcdir)/src/lib-sieve-tool/libsieve-tool.la \
 	$(dovecot_incdir)/src/lib-storage/list/libstorage_list.a \
 	$(dovecot_incdir)/src/lib-storage/register/libstorage-register.a \
-	$(STORAGE_LIBS) \
-	$(dovecot_incdir)/src/lib-storage/libstorage.a \
-	$(dovecot_incdir)/src/lib-index/libindex.a \
-	$(dovecot_incdir)/src/lib-imap/libimap.a \
-	$(dovecot_incdir)/src/lib-mail/libmail.a \
-	$(dovecot_incdir)/src/lib-charset/libcharset.a \
-	$(dovecot_incdir)/src/lib/liblib.a
+	$(STORAGE_LIBS)
 
 ldadd = \
 	$(libs) \
-- 
GitLab