Attachment 143371 Details for Bug 190364 – Fix LD_LIBRARY_PATH, Change RUN_DEPENDS

[patch] Fix LD_LIBRARY_PATH, Change RUN_DEPENDS

galera.diff (text/plain), 1.40 KB, created by Horia Racoviceanu on 2014-06-04 17:24:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Horia Racoviceanu

Created: 2014-06-04 17:24:14 UTC

Size: 1.40 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 355663)
>+++ Makefile	(working copy)
>@@ -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 @@
> 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 @@
> 
> .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+=	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
> 
>Index: files/garb.in
>===================================================================
>--- files/garb.in	(revision 355663)
>+++ files/garb.in	(working copy)
>@@ -45,7 +45,7 @@
> 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()
> {

Actions: View | Diff

Attachments on bug 190364: 143195 | 143369 | 143371