svn commit: r1930053 - subversion/trunk/tools/dev/unix-build
| Newsgroups | gmane.comp.version-control.subversion.svn |
|---|---|
| Message-ID | <176433682888.394652.18363110884305146454@svn02-us-east.apache.org> |
Author: stsp Date: Fri Nov 28 13:33:48 2025 New Revision: 1930053 Log: * tools/dev/unix-build/Makefile.svn: Merge r1833229 from serf trunk into serf 1.3.10. Fixes build issues with OpenSSL 1.1.1c. Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn ============================================================================== --- subversion/trunk/tools/dev/unix-build/Makefile.svn Fri Nov 28 12:45:02 2025 (r1930052) +++ subversion/trunk/tools/dev/unix-build/Makefile.svn Fri Nov 28 13:33:48 2025 (r1930053) @@ -957,6 +957,9 @@ $(SERF_OBJDIR)/.retrieved: if [ ! -d $(SERF_SRCDIR) ]; then \ svn co $(SERF_URL) $(SERF_SRCDIR); \ svn merge ^/serf/branches/1.3.x-sslbuild@1910116 $(SERF_SRCDIR); \ + (cd $(SERF_SRCDIR) && svn merge -c r1833229 \ + ^/serf/trunk/buckets/ssl_buckets.c \ + buckets/ssl_buckets.c); \ fi touch $@