Attachment 183037 Details for Bug 219597 – patch

[patch] patch

pari.patch (text/plain), 3.50 KB, created by Yuri Victorovich on 2017-05-29 15:51:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2017-05-29 15:51:01 UTC

Size: 3.50 KB

patch

obsolete

>Index: math/pari/Makefile
>===================================================================
>--- math/pari/Makefile	(revision 441874)
>+++ math/pari/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	pari
> PORTVERSION=	2.9.2
>+PORTREVISION=	1
> PORTEPOCH=	2
> CATEGORIES=	math
> MASTER_SITES=	http://pari.math.u-bordeaux.fr/pub/pari/unix/ \
>@@ -21,14 +22,20 @@
> CONFIGURE_SCRIPT=	Configure
> CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man/man1 \
> 		--prefix=${PREFIX} \
>-		--with-gmp=${LOCALBASE}
>+		--with-readline
> HAS_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> USE_PERL5=	build
>-USES=		perl5
>+USES=		perl5 readline
> 
> OPTIONS_DEFINE=		DOCS OPTIMIZED_CFLAGS X11
>-OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS X11
>+OPTIONS_RADIO=		THREADS
>+OPTIONS_RADIO_THREADS=	PTHREADS MPI
>+OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS X11 PTHREADS
>+THREADS_DESC=		Thread engine (single-threaded when none is selected)
>+PTHREADS_DESC=		Enable pthread thread engine
>+MPI_DESC=		Enable MPI thread engine
>+MPI_BUILD_ENV=		CC=mpicc
> .ifndef WITH_DEBUG
> OPTIMIZED_CFLAGS_CFLAGS=	-O3 -fno-strict-aliasing -fomit-frame-pointer
> .endif
>@@ -35,6 +42,14 @@
> X11_CONFIGURE_ON=	--graphic=X11
> X11_CONFIGURE_OFF=	--graphic=none
> X11_USE=		xorg=x11
>+MPI_RUN_DEPENDS=	${LOCALBASE}/bin/mpirun:net/mpich2
>+MPI_BUILD_DEPENDS=	${LOCALBASE}/bin/mpicc:net/mpich2
>+MPI_LIB_DEPENDS=	libgmp.so:math/gmp
>+PTHREADS_LIB_DEPENDS=	libgmp.so:math/gmp
>+PTHREADS_CONFIGURE_ON=	--mt=pthread --with-gmp=${LOCALBASE}
>+MPI_CONFIGURE_ON=	--mt=mpi --with-gmp=${LOCALBASE}
>+MPI_CONFIGURE_ENV=	CC=${LOCALBASE}/bin/mpicc
>+OPTIONS_SUB=	yes
> 
> PLIST_SUB=	GP_VERSION=${GP_VERSION} PORTVERSION=${PORTVERSION}
> PORTDATA=	*
>@@ -46,8 +61,18 @@
> post-patch:
> 	@${REINPLACE_CMD} -e '/^CFLAGS=/s/\$$cflags//' \
> 		${WRKSRC}/config/get_cc
>+	@${REINPLACE_CMD} -e 's|-lX11|-L${LOCALBASE}/lib -lX11|' \
>+		${WRKSRC}/config/get_X11
>+	@${REINPLACE_CMD} -e 's|-lreadline|-L${LOCALBASE}/lib -lreadline|' \
>+		${WRKSRC}/config/get_readline
> 
> post-install:
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpari-gmp.so.*
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpari-gmp*.so.*
> 
>+do-test-PTHREADS-on:
>+	@cd ${WRKSRC} && ${MAKE_CMD} test-parallel
>+
>+do-test-MPI-on:
>+	@cd ${WRKSRC} && ${MAKE_CMD} test-parallel RUNTEST="mpirun -np 3"
>+
> .include <bsd.port.mk>
>Index: math/pari/distinfo
>===================================================================
>--- math/pari/distinfo	(revision 441874)
>+++ math/pari/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1491984081
>+TIMESTAMP = 1495916881
> SHA256 (pari-2.9.2.tar.gz) = 9aa24cbbcf4e0b09dcc21cf9b09f2eb08e38ee16ab13651be7274c9b3e46207e
> SIZE (pari-2.9.2.tar.gz) = 3842811
>Index: math/pari/files/patch-Configure
>===================================================================
>--- math/pari/files/patch-Configure	(nonexistent)
>+++ math/pari/files/patch-Configure	(working copy)
>@@ -0,0 +1,15 @@
>+--- Configure.orig	2017-05-28 16:56:49 UTC
>++++ Configure
>+@@ -104,9 +104,9 @@ case $kernlvl1 in
>+ gmp) libpari_base=pari-gmp;;
>+ none) libpari_base=pari;;
>+ esac
>+-case $enable_tls in
>+-yes) libpari_base="${libpari_base}-tls"
>+-esac
>++#case $enable_tls in
>++#yes) libpari_base="${libpari_base}-tls"
>++#esac
>+ 
>+ if test `expr $VersionMinor % 2` = 0; then
>+   libpari_base=$libpari_base-$version
>
>Property changes on: math/pari/files/patch-Configure
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

yuri: maintainer-approval+

Actions: View | Diff

Attachments on bug 219597: 182969 | 182974 | 182975 | 182977 | 183037