/subversion/trunk/tools/dev/unix-build/Makefile.svn MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable
Stefan, If your scons is new enough it should handle rpath for you. It does handle rpath on other platforms. Bert From: [email protected] Sent: =E2=80=8E08/=E2=80=8E08/=E2=80=8E2013 22:11 To: [email protected] Subject: svn commit: r1512013 - /subversion/trunk/tools/dev/unix-build/Makefile.svn Author: stsp Date: Thu Aug 8 20:11:16 2013 New Revision: 1512013 URL: http://svn.apache.org/r1512013 Log: * tools/dev/unix-build/Makefile.svn: Switch my custom build script, and thu= s the bb-openbsd buildbot, to serf 1.3.0. 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/Mak= efile.svn?rev=3D1512013&r1=3D1512012&r2=3D1512013&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- subversion/trunk/tools/dev/unix-build/Makefile.svn (original) +++ subversion/trunk/tools/dev/unix-build/Makefile.svn Thu Aug 8 20:11:16 = 2013 @@ -72,7 +72,7 @@ GNU_ICONV_VER=09=3D 1.14 APR_UTIL_VER=09=3D 1.4.1 HTTPD_VER=09=3D 2.2.25 NEON_VER=09=3D 0.29.6 -SERF_VER=09=3D 1.2.1 +SERF_VER=09=3D 1.3.0 SERF_OLD_VER=09=3D 0.3.1 CYRUS_SASL_VER=09=3D 2.1.25 SQLITE_VER=09=3D 3071600 @@ -707,7 +707,7 @@ serf-reset: =09=09rm -f $(SERF_OBJDIR)/$(f);) =20 serf-clean: -=09-(cd $(SERF_SRCDIR) && ./serfmake clean) +=09-(cd $(SERF_SRCDIR) && scons -c) =20 =20 # fetch distfile for serf @@ -733,19 +733,16 @@ $(SERF_OBJDIR)/.retrieved: # compile serf (serf won't compile outside its source tree) $(SERF_OBJDIR)/.compiled: $(SERF_OBJDIR)/.retrieved =09cd $(SERF_SRCDIR) && \ -=09=09env CFLAGS=3D"-O0 -g $(PROFILE_CFLAGS)" \ -=09=09=09./serfmake --with-apr=3D$(PREFIX)/apr \ -=09=09=09--prefix=3D$(PREFIX)/serf \ -=09=09=09build +=09=09scons DEBUG=3D1 CFLAGS=3D"-O0,-g,$(PROFILE_CFLAGS)" \ +=09=09=09APR=3D$(PREFIX)/apr \ +=09=09=09APU=3D$(PREFIX)/apr \ +=09=09=09PREFIX=3D$(PREFIX)/serf =09touch $@ =20 # install serf $(SERF_OBJDIR)/.installed: $(SERF_OBJDIR)/.compiled =09cd $(SERF_SRCDIR) && \ -=09=09./serfmake --with-apr=3D$(PREFIX)/apr \ -=09=09=09--with-apr-util=3D$(PREFIX)/apr \ -=09=09=09--prefix=3D$(PREFIX)/serf \ -=09=09=09install +=09=09scons install =09touch $@ =20 ####################################################################### @@ -1174,6 +1171,7 @@ $(SVN_OBJDIR)/.retrieved: ifeq ($(BRANCH_MAJOR),1.7) BDB_FLAG=3Ddb.h:$(PREFIX)/bdb/include:$(PREFIX)/bdb/lib:db-$(BDB_MAJOR_VER= ) SERF_FLAG=3D--with-serf=3D"$(PREFIX)/serf" +SERF_LDFLAG=3D-Wl,-rpath,$(PREFIX)/serf/lib MOD_DAV_SVN=3Dmodules/svn-$(WC)/mod_dav_svn.so MOD_AUTHZ_SVN=3Dmodules/svn-$(WC)/mod_authz_svn.so LIBMAGIC_FLAG=3D--with-libmagic=3D$(PREFIX)/libmagic @@ -1182,6 +1180,7 @@ JAVAHL_CHECK_TARGET=3Dcheck-javahl else ifeq ($(BRANCH_MAJOR),1.6) BDB_FLAG=3Ddb.h:$(PREFIX)/bdb/include:$(PREFIX)/bdb/lib:db-$(BDB_MAJOR_VER= ) SERF_FLAG=3D--with-serf=3D"$(PREFIX)/serf" +SERF_LDFLAG=3D-Wl,-rpath,$(PREFIX)/serf/lib MOD_DAV_SVN=3Dmodules/svn-$(WC)/mod_dav_svn.so MOD_AUTHZ_SVN=3Dmodules/svn-$(WC)/mod_authz_svn.so W_NO_SYSTEM_HEADERS=3D-Wno-system-headers @@ -1199,6 +1198,9 @@ JAVAHL_CHECK_TARGET=3Dcheck-javahl else # 1.8 BDB_FLAG=3Ddb.h:$(PREFIX)/bdb/include:$(PREFIX)/bdb/lib:db-$(BDB_MAJOR_VER= ) SERF_FLAG=3D--with-serf=3D"$(PREFIX)/serf" +# serf >=3D 1.3.0 is built with scons and no longer sets up rpath linker f= lags, +# so we have to do that ourselves :( +SERF_LDFLAG=3D-Wl,-rpath,$(PREFIX)/serf/lib MOD_DAV_SVN=3Dmodules/svn-$(WC)/mod_dav_svn.so MOD_AUTHZ_SVN=3Dmodules/svn-$(WC)/mod_authz_svn.so LIBMAGIC_FLAG=3D--with-libmagic=3D$(PREFIX)/libmagic @@ -1225,7 +1227,7 @@ endif $(SVN_OBJDIR)/.configured: $(SVN_OBJDIR)/.retrieved $(DISTDIR)/$(JUNIT_DIS= T) =09cd $(SVN_SRCDIR) && ./autogen.sh =09cd $(svn_builddir) && \ -=09=09env LDFLAGS=3D"-L$(PREFIX)/neon/lib -L$(PREFIX)/apr/lib" \ +=09=09env LDFLAGS=3D"-L$(PREFIX)/neon/lib -L$(PREFIX)/apr/lib $(SERF_LDFLA= G)" \ =09=09=09LD_LIBRARY_PATH=3D"$(LD_LIBRARY_PATH):$$LD_LIBRARY_PATH" \ =09=09=09GREP=3D"`which grep`" \ =09=09=09PATH=3D$(PREFIX)/ruby/bin:$(PREFIX)/python/bin:$$PATH \
