Author: stsp Date: Mon Nov 21 11:02:12 2022 New Revision: 1905427 URL: http://svn.apache.org/viewvc?rev=1905427&view=rev Log: * tools/dev/unix-build/Makefile.svn: Fix serf build with scons 3 and above.
Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=1905427&r1=1905426&r2=1905427&view=diff ============================================================================== --- subversion/trunk/tools/dev/unix-build/Makefile.svn (original) +++ subversion/trunk/tools/dev/unix-build/Makefile.svn Mon Nov 21 11:02:12 2022 @@ -937,6 +937,8 @@ $(SERF_OBJDIR)/.retrieved: if [ ! -d $(SERF_SRCDIR) ]; then \ svn co $(SERF_URL) $(SERF_SRCDIR); \ svn merge ^/serf/branches/1.3.x-sslbuild@1781542 $(SERF_SRCDIR); \ + svn merge -c 1811083 ^/serf/trunk@1811083 $(SERF_SRCDIR); \ + svn merge -c 1814604 ^/serf/trunk@1814604 $(SERF_SRCDIR); \ fi touch $@ @@ -945,7 +947,7 @@ $(SERF_OBJDIR)/.compiled: $(SERF_OBJDIR) $(APR_UTIL_OBJDIR)/.installed cd $(SERF_SRCDIR) && \ scons -j${MAKE_JOBS} DEBUG=1 \ - CFLAGS="-O0 -g $(PROFILE_CFLAGS) -DAPR_POOL_DEBUG" \ + CFLAGS="-O0 -g $(PROFILE_CFLAGS) -fPIC -DAPR_POOL_DEBUG" \ CC=$(CC) CXX=$(CXX) \ APR=$(PREFIX)/apr \ APU=$(PREFIX)/apr \