]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Bug 5489: Fix "make check" linking on Solaris (#2049)
authorFrancesco Chemolli <5175948+kinkie@users.noreply.github.com>
Sun, 13 Apr 2025 22:56:57 +0000 (22:56 +0000)
committerAmos Jeffries <yadij@users.noreply.github.com>
Thu, 17 Apr 2025 17:07:00 +0000 (05:07 +1200)
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

src/Makefile.am

index e0654b8639263e97816b51a6be84d38b6d6e9f47..19cf2acbaaa5845501b903d0826b58dda54aa996 100644 (file)
@@ -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 \