Attachment 186187 Details for Bug 221947 – Fix build when pari is installed

[patch] Fix build when pari is installed

p5-Math-Pari.patch (text/plain), 1.64 KB, created by Anton Yuzhaninov on 2017-09-09 02:28:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Anton Yuzhaninov

Created: 2017-09-09 02:28:48 UTC

Size: 1.64 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 449468)
>+++ Makefile	(working copy)
>@@ -24,7 +24,8 @@ PARI_WRKSRC=	${WRKDIR}/pari-2.3.5
> CFLAGS+=	-I${PARI_WRKSRC}/src/headers -I${PARI_WRKSRC}/build
> 
> CONFIGURE_ARGS=	parilib="-L${PARI_WRKSRC}/build -lpari" \
>-		paridir=${PARI_WRKSRC}
>+		paridir=${PARI_WRKSRC} \
>+		LDFLAGS="${LDFLAGS}"
> MAKE_ARGS=	LDLOADLIBS="-lm -L${PARI_WRKSRC}/build -Wl,-rpath=${SITE_ARCH}/auto/Math/Pari -lpari"
> 
> post-patch:
>Index: files/patch-Makefile.PL
>===================================================================
>--- files/patch-Makefile.PL	(revision 449468)
>+++ files/patch-Makefile.PL	(working copy)
>@@ -11,12 +11,21 @@
>    make_pod 'libPARI.dumb.pod', '-to_dumb_pod', $paridir;
>    # ... and paricfg.h
>    %opts = build_paricfg($paridir, $common::do_configure, $pari_version);
>-@@ -199,7 +199,7 @@ my $extra_inc = extra_includes($paridir)
>+@@ -195,11 +195,16 @@ $define .= ' -DDL_DFLT_NAME=NULL' if $co
>+ 
>+ my $extra_inc = extra_includes($paridir);
>+ 
>++# strip -L${PREFIX}/lib from lddlflags to not link with installed pari
>++my $lddlflags = $Config{lddlflags};
>++$lddlflags =~ s/-L$Config{prefix}\/lib(\s|$)//;
>++
>+ # See lib/ExtUtils/MakeMaker.pm for details of how to influence
>  # the contents of the Makefile being created.
>  &WriteMakefile(
>  	       LIBS	     =>  $libs,
> -	       INC	     => $extra_inc . ' -I $(PARI_DIR)/src/headers -I $(PARI_DIR)/src -I ./libPARI',
> +	       INC	     => '-I$(PARI_DIR)/src',
>++	       LDDLFLAGS => $lddlflags,
>  	       NAME	     => 'Math::Pari',
>  	       ($common::parilib ? () :
>  		 (MYEXTLIB   =>  'libPARI/libPARI$(LIB_EXT)')),

Actions: View | Diff

Attachments on bug 221947: 185934 | 186187