From: Francesco Chemolli <5175948+kinkie@users.noreply.github.com>
Date: Sun, 13 Apr 2025 22:56:57 +0000 (+0000)
Subject: Bug 5489: Fix "make check" linking on Solaris (#2049)
X-Git-Tag: SQUID_6_14~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f4863b106bf37da697ff7f2eb5f003f79f5f7dd;p=thirdparty%2Fsquid.git

Bug 5489: Fix "make check" linking on Solaris (#2049)

Change link order of libcomm and libip to fix missing symbols at link
time on Solaris:

    libtool: link: /usr/gcc/14/bin/g++ ... -o tests/testCacheManager
    _ZN2Ip11InterceptorE ... libcomm.a
    _ZN2Ip9Intercept9LookupNatERKN4Comm10ConnectionE ... libcomm.a
    ld: fatal: symbol referencing errors
---

diff --git a/src/Makefile.am b/src/Makefile.am
index e0654b8639..19cf2acbaa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -494,10 +494,10 @@ squid_LDADD = \
 	dns/libdns.la \
 	base/libbase.la \
 	libsquid.la \
-	ip/libip.la \
 	fs/libfs.la \
 	DiskIO/libdiskio.la \
 	comm/libcomm.la \
+	ip/libip.la \
 	anyp/libanyp.la \
 	security/libsecurity.la \
 	$(SSL_LIBS) \
@@ -1943,11 +1943,11 @@ tests_test_http_range_LDADD = \
 	acl/libapi.la \
 	proxyp/libproxyp.la \
 	parser/libparser.la \
-	ip/libip.la \
 	fs/libfs.la \
 	anyp/libanyp.la \
 	icmp/libicmp.la \
 	comm/libcomm.la \
+	ip/libip.la \
 	log/liblog.la \
 	format/libformat.la \
 	$(REPL_OBJS) \
@@ -2328,7 +2328,6 @@ tests_testHttpRequest_LDADD = \
 	acl/libstate.la \
 	acl/libapi.la \
 	parser/libparser.la \
-	ip/libip.la \
 	fs/libfs.la \
 	$(SSL_LIBS) \
 	ipc/libipc.la \
@@ -2341,6 +2340,7 @@ tests_testHttpRequest_LDADD = \
 	$(SNMP_LIBS) \
 	icmp/libicmp.la \
 	comm/libcomm.la \
+	ip/libip.la \
 	log/liblog.la \
 	format/libformat.la \
 	store/libstore.la \
@@ -2628,9 +2628,9 @@ tests_testCacheManager_LDADD = \
 	acl/libapi.la \
 	dns/libdns.la \
 	base/libbase.la \
-	ip/libip.la \
 	fs/libfs.la \
 	comm/libcomm.la \
+	ip/libip.la \
 	eui/libeui.la \
 	icmp/libicmp.la \
 	log/liblog.la \