Author: rinrab
Date: Tue Jun 25 15:09:20 2024
New Revision: 1918596

URL: http://svn.apache.org/viewvc?rev=1918596&view=rev
Log:
Explicitly specify ws2_32.lib dependency for all libraries that use
it, instead of relying on inheritance.

* build.conf
  (libsvn_fs_fs, libsvn_fs_x, libsvn_subr, svnfsfs): Add `ws2_32.lib`
   to `msvc-libs` field.

Affected only Windows.

Modified:
    subversion/trunk/build.conf

Modified: subversion/trunk/build.conf
URL: 
http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=1918596&r1=1918595&r2=1918596&view=diff
==============================================================================
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Tue Jun 25 15:09:20 2024
@@ -298,6 +298,7 @@ install = fsmod-lib
 libs = libsvn_delta libsvn_subr aprutil apriconv apr libsvn_fs_util
 msvc-export = private/svn_fs_fs_private.h ../libsvn_fs_fs/fs_init.h
 msvc-delayload = yes
+msvc-libs = ws2_32.lib
 
 [libsvn_fs_x]
 description = Subversion FSX Repository Filesystem Library
@@ -307,6 +308,7 @@ install = fsmod-lib
 libs = libsvn_delta libsvn_subr aprutil apriconv apr libsvn_fs_util
 msvc-export = ../libsvn_fs_x/fs_init.h
 msvc-delayload = yes
+msvc-libs = ws2_32.lib
 
 # Low-level grab bag of utilities
 [libsvn_fs_util]
@@ -378,7 +380,7 @@ sources = *.c lz4/*.c
 libs = aprutil apriconv apr xml zlib apr_memcache
        sqlite magic intl lz4 utf8proc macos-plist macos-keychain
 msvc-libs = kernel32.lib advapi32.lib shfolder.lib ole32.lib
-            crypt32.lib version.lib
+            crypt32.lib version.lib ws2_32.lib
 msvc-export = 
         svn_auth.h svn_base64.h svn_cache_config.h svn_checksum.h svn_cmdline.h
         svn_compat.h svn_config.h svn_ctype.h svn_dirent_uri.h svn_dso.h 
@@ -445,6 +447,7 @@ type = exe
 path = subversion/svnfsfs
 install = bin
 libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr apriconv apr
+msvc-libs = ws2_32.lib
 
 # ----------------------------------------------------------------------------
 #


Reply via email to