Author: stsp
Date: Sun Oct 16 11:58:42 2016
New Revision: 1765143
URL: http://svn.apache.org/viewvc?rev=1765143&view=rev
Log:
Fix my personal build script for OpenBSD-current.
In OpenBSD-current sqlite has moved from base to ports.
As a result my system had old sqlite libs in /usr/lib, new sqlite libs
in /usr/local/lib (same story for headers: {/usr/,/usr/local}include).
My self-compiled svn builds now failed to run with:
svn: E200029: Couldn't perform atomic initialization
subversion/libsvn_subr/sqlite.c:794: (apr_err=SVN_ERR_SQLITE_ERROR)
svn: E200030: SQLite compiled for 3.14.2, but running with 3.8.5
I really really wish libtool had some logic to put private header
and library search paths from /home before anything within /usr...
But it does not, so let's resort to workarounds again to at least
get this stuff to build...
* tools/dev/unix-build/Makefile.svn:
Disable gnome-keyring because it adds -I/usr/local/include to the header
search path. This avoids up picking the wrong sqlite headers even though
--with-sqlite=$prefix is used to force use of a private copy of sqlite.
Also, pass an explicit prefix for zlib, which avoids adding -L/usr/lib
to LDFLAGS which resulted in the wrong sqlite libs being linked in.
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=1765143&r1=1765142&r2=1765143&view=diff
==============================================================================
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Sun Oct 16 11:58:42 2016
@@ -1411,6 +1411,8 @@ $(SVN_OBJDIR)/.configured: $(SVN_OBJDIR)
$(SVN_WITH_SASL) \
$(SERF_FLAG) \
--with-sqlite="$(PREFIX)/sqlite" \
+ --with-zlib="/usr" \
+ --without-gnome-keyring \
--with-berkeley-db="$(BDB_FLAG)" \
--with-ruby-sitedir="$(SVN_PREFIX)/lib/ruby/site_ruby" \
--disable-mod-activation \
