[patch] varnish-2.1.4-fix-link-order-for-as-needed.patch

varnish-2.1.4-fix-link-order-for-as-needed.patch (text/plain), 5.29 KB, created by Thilo Bangert (RETIRED) (RETIRED) on 2010-12-02 09:25:46 UTC

diff -Naur varnish-2.1.4/bin/varnishadm/Makefile.am varnish-2.1.4.orig/bin/varnishadm/Makefile.am
--- varnish-2.1.4/bin/varnishadm/Makefile.am	2010-12-02 10:05:13.388000001 +0100
+++ varnish-2.1.4.orig/bin/varnishadm/Makefile.am	2010-12-02 10:04:42.464000001 +0100
@@ -10,8 +10,8 @@
 	varnishadm.c
 
 varnishadm_LDADD = \
-	$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
 	$(top_builddir)/lib/libvarnish/libvarnish.la \
+	$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
 	${PTHREAD_LIBS} ${NET_LIBS}
 
 %.1: $(top_srcdir)/doc/sphinx/reference/%.rst
diff -Naur varnish-2.1.4/bin/varnishd/Makefile.am varnish-2.1.4.orig/bin/varnishd/Makefile.am
--- varnish-2.1.4/bin/varnishd/Makefile.am	2010-12-02 10:06:37.364000522 +0100
+++ varnish-2.1.4.orig/bin/varnishd/Makefile.am	2010-12-02 10:04:42.452000001 +0100
@@ -85,8 +85,8 @@
 varnishd_LDFLAGS = -export-dynamic
 
 varnishd_LDADD = \
-	$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
 	$(top_builddir)/lib/libvarnish/libvarnish.la \
+	$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
 	$(top_builddir)/lib/libvcl/libvcl.la \
 	@JEMALLOC_LDADD@ \
 	${DL_LIBS} ${PTHREAD_LIBS} ${NET_LIBS} ${LIBM} ${LIBUMEM}
diff -Naur varnish-2.1.4/bin/varnishlog/Makefile.am varnish-2.1.4.orig/bin/varnishlog/Makefile.am
--- varnish-2.1.4/bin/varnishlog/Makefile.am	2010-12-02 10:07:21.919999548 +0100
+++ varnish-2.1.4.orig/bin/varnishlog/Makefile.am	2010-12-02 10:04:42.464000001 +0100
@@ -11,8 +11,8 @@
 varnishlog_SOURCES = varnishlog.c
 
 varnishlog_LDADD = \
-	$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
 	$(top_builddir)/lib/libvarnish/libvarnish.la \
+	$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
 	$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
 	${PTHREAD_LIBS}
 
diff -Naur varnish-2.1.4/bin/varnishncsa/Makefile.am varnish-2.1.4.orig/bin/varnishncsa/Makefile.am
--- varnish-2.1.4/bin/varnishncsa/Makefile.am	2010-12-02 10:07:40.140000445 +0100
+++ varnish-2.1.4.orig/bin/varnishncsa/Makefile.am	2010-12-02 10:04:42.464000001 +0100
@@ -11,8 +11,8 @@
 varnishncsa_SOURCES = varnishncsa.c
 
 varnishncsa_LDADD = \
-	$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
 	$(top_builddir)/lib/libvarnish/libvarnish.la \
+	$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
 	$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
 	${PTHREAD_LIBS}
 
diff -Naur varnish-2.1.4/bin/varnishreplay/Makefile.am varnish-2.1.4.orig/bin/varnishreplay/Makefile.am
--- varnish-2.1.4/bin/varnishreplay/Makefile.am	2010-12-02 10:08:01.212000372 +0100
+++ varnish-2.1.4.orig/bin/varnishreplay/Makefile.am	2010-12-02 10:04:42.444000001 +0100
@@ -12,8 +12,8 @@
 	varnishreplay.c
 
 varnishreplay_LDADD = \
-	$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
 	$(top_builddir)/lib/libvarnish/libvarnish.la \
+	$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
 	$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
 	${PTHREAD_LIBS} ${NET_LIBS}
 
diff -Naur varnish-2.1.4/bin/varnishsizes/Makefile.am varnish-2.1.4.orig/bin/varnishsizes/Makefile.am
--- varnish-2.1.4/bin/varnishsizes/Makefile.am	2010-12-02 10:08:13.472000348 +0100
+++ varnish-2.1.4.orig/bin/varnishsizes/Makefile.am	2010-12-02 10:04:42.444000001 +0100
@@ -9,8 +9,8 @@
 varnishsizes_SOURCES = varnishsizes.c
 
 varnishsizes_LDADD = \
-	$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
 	$(top_builddir)/lib/libvarnish/libvarnish.la \
+	$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
 	$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
 	-lm \
 	${CURSES_LIBS} ${PTHREAD_LIBS}
diff -Naur varnish-2.1.4/bin/varnishstat/Makefile.am varnish-2.1.4.orig/bin/varnishstat/Makefile.am
--- varnish-2.1.4/bin/varnishstat/Makefile.am	2010-12-02 10:08:35.096000377 +0100
+++ varnish-2.1.4.orig/bin/varnishstat/Makefile.am	2010-12-02 10:04:42.452000001 +0100
@@ -11,8 +11,8 @@
 varnishstat_SOURCES = varnishstat.c
 
 varnishstat_LDADD = \
-	$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
 	$(top_builddir)/lib/libvarnish/libvarnish.la \
+	$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
 	$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
 	${CURSES_LIBS} ${RT_LIBS} ${PTHREAD_LIBS}
 
diff -Naur varnish-2.1.4/bin/varnishtest/Makefile.am varnish-2.1.4.orig/bin/varnishtest/Makefile.am
--- varnish-2.1.4/bin/varnishtest/Makefile.am	2010-12-02 10:08:48.420000405 +0100
+++ varnish-2.1.4.orig/bin/varnishtest/Makefile.am	2010-12-02 10:04:42.464000001 +0100
@@ -24,8 +24,8 @@
 		vtc_varnish.c
 
 varnishtest_LDADD = \
-		$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
 		$(top_builddir)/lib/libvarnish/libvarnish.la \
+		$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
 		$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
 		${LIBM} ${PTHREAD_LIBS}
 
diff -Naur varnish-2.1.4/bin/varnishtop/Makefile.am varnish-2.1.4.orig/bin/varnishtop/Makefile.am
--- varnish-2.1.4/bin/varnishtop/Makefile.am	2010-12-02 10:09:11.460001121 +0100
+++ varnish-2.1.4.orig/bin/varnishtop/Makefile.am	2010-12-02 10:04:42.444000001 +0100
@@ -11,8 +11,8 @@
 varnishtop_SOURCES = varnishtop.c
 
 varnishtop_LDADD = \
-	$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
 	$(top_builddir)/lib/libvarnish/libvarnish.la \
+	$(top_builddir)/lib/libvarnishcompat/libvarnishcompat.la \
 	$(top_builddir)/lib/libvarnishapi/libvarnishapi.la \
 	${CURSES_LIBS} ${PTHREAD_LIBS}