diff options
| author | John Marino <marino@FreeBSD.org> | 2014-07-20 20:42:23 +0000 |
|---|---|---|
| committer | John Marino <marino@FreeBSD.org> | 2014-07-20 20:42:23 +0000 |
| commit | 688b2e029a7982dd85663e64538b9820baef7984 (patch) | |
| tree | dcd1ca174bc0c428a7ddcfcbe230ff95210208b3 /databases/galera | |
| parent | 5da0c6ef16d359d7e5538f121037e3f7104cefb9 (diff) | |
| download | ports-688b2e029a7982dd85663e64538b9820baef7984.tar.gz ports-688b2e029a7982dd85663e64538b9820baef7984.zip | |
Notes
Diffstat (limited to 'databases/galera')
| -rw-r--r-- | databases/galera/Makefile | 11 | ||||
| -rw-r--r-- | databases/galera/files/garb.in | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/databases/galera/Makefile b/databases/galera/Makefile index b4b2483e8ed0..c62dd1bb82f5 100644 --- a/databases/galera/Makefile +++ b/databases/galera/Makefile @@ -4,6 +4,7 @@ PORTNAME= galera PORTVERSION= 25.3.5 DISTVERSIONSUFFIX= -src +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= https://launchpadlibrarian.net/170877450/ @@ -23,7 +24,7 @@ USES= scons shebangfix USE_CXXSTD= c++11 USE_LDCONFIG= yes USE_OPENSSL= yes -USE_PYTHON= yes +USE_PYTHON_BUILD= yes MAKE_CMD= ${SCONS} -j${MAKE_JOBS_NUMBER} --config=force @@ -70,9 +71,11 @@ GARB_USE= RC_SUBR=garb .if ${OSVERSION} > 1000000 BUILD_DEPENDS+= asio>=0:${PORTSDIR}/net/asio -RUN_DEPENDS:= ${BUILD_DEPENDS} +RUN_DEPENDS+= asio>=0:${PORTSDIR}/net/asio +SUB_LIST= LD_LIBRARY_PATH=$$LD_LIBRARY_PATH .else USE_GCC= yes +SUB_LIST= LD_LIBRARY_PATH=${LOCALBASE}/lib/${CC}:$$LD_LIBRARY_PATH .endif .if ${OSVERSION} < 900506 @@ -91,10 +94,6 @@ MAKE_CMD+= bpostatic=${PREFIX}/lib/libboost_program_options.so MAKE_CMD+= debug=3 .endif -.if ${PORT_OPTIONS:MGARB} -SUB_LIST= LD_LIBRARY_PATH=${LOCALBASE}/lib/${CC}:$$LD_LIBRARY_PATH -.endif - post-patch: @${REINPLACE_CMD} -e '/-Werror/d' ${WRKSRC}/SConstruct diff --git a/databases/galera/files/garb.in b/databases/galera/files/garb.in index af7fc634a0e9..11aa9ed031d6 100644 --- a/databases/galera/files/garb.in +++ b/databases/galera/files/garb.in @@ -45,7 +45,7 @@ command_args="-c -f -u nobody -p $garb_pid_file $procname" start_precmd="${name}_prestart" start_postcmd="${name}_poststart" stop_precmd="${name}_prestop" -export %%LD_LIBRARY_PATH%% +export LD_LIBRARY_PATH=%%LD_LIBRARY_PATH%% garb_prestart() { |