View | Details | Raw Unified | Return to bug 221947
Collapse All | Expand All

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

Return to bug 221947