Date: Wed, 25 Mar 2015 07:37:15 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382199 - in head/math: PDL R atlas atlas/files fityk graphthing lapacke levmar libflame libocas libproj4 mumps mumps/files sage sdpara sdpara/files spooles spooles/files suitesparse su... Message-ID: <201503250737.t2P7bFDn001028@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Wed Mar 25 07:37:15 2015 New Revision: 382199 URL: https://svnweb.freebsd.org/changeset/ports/382199 QAT: https://qat.redports.org/buildarchive/r382199/ Log: math category: Remove $PTHREAD_LIBS Note that math/PDL did not pass stage-QA before, so it was fixed. approved by: PTHREAD blanket Modified: head/math/PDL/Makefile head/math/R/Makefile head/math/atlas/Makefile head/math/atlas/files/patch-CONFIG+src+SpewMakeInc.c head/math/fityk/Makefile head/math/graphthing/Makefile head/math/lapacke/Makefile head/math/levmar/Makefile head/math/libflame/Makefile head/math/libocas/Makefile head/math/libproj4/Makefile head/math/mumps/Makefile head/math/mumps/files/patch-Make.inc+Makefile.inc.generic head/math/mumps/files/patch-Make.inc+Makefile.inc.generic.SEQ head/math/sage/Makefile head/math/sdpara/Makefile head/math/sdpara/files/patch-Makefile head/math/spooles/Makefile head/math/spooles/files/patch-Make.inc head/math/suitesparse/Makefile head/math/superlu_mt/Makefile head/math/superlu_mt/files/patch-make.inc Modified: head/math/PDL/Makefile ============================================================================== --- head/math/PDL/Makefile Wed Mar 25 06:47:03 2015 (r382198) +++ head/math/PDL/Makefile Wed Mar 25 07:37:15 2015 (r382199) @@ -3,7 +3,7 @@ PORTNAME= PDL PORTVERSION= 2.007 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math perl5 MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:CHM @@ -26,7 +26,7 @@ PORTSCOUT= limit:^[0-9\.]*$$ USES= gmake perl5 USE_PERL5= configure MAKE_ENV= PERL5LIB=${WRKSRC}/blib/lib -PLIST_FILES= bin/pdl bin/pdldoc bin/perldl bin/pptemplate \ +PLIST_FILES= bin/pdl bin/pdl2 bin/pdldoc bin/perldl bin/pptemplate \ ${SITE_ARCH_REL}/Inline/Pdlpp.pm \ ${SITE_ARCH_REL}/Inline/MakePdlppInstallable.pm MAKE_JOBS_UNSAFE= yes @@ -71,7 +71,7 @@ SINK_RUN_DEPENDS= ppmtogif:${PORTSDIR}/g post-patch: @${GREP} -lR '#!/.*bin/perl' ${WRKSRC}/ | ${XARGS} ${SED} -e 's|#!/.*bin/perl|#!${PERL}|' -i '' @${GREP} -lR 'x86_64' ${WRKSRC}/ | ${XARGS} ${SED} -e 's|x86_64|amd64|g' -i '' - @${REINPLACE_CMD} -e "/POSIX_THREADS_LIBS/ s|undef|'${PTHREAD_LIBS}'|" \ + @${REINPLACE_CMD} -e "/POSIX_THREADS_LIBS/ s|undef|'-lpthread'|" \ ${WRKSRC}/perldl.conf # autogen plist @@ -84,7 +84,8 @@ post-install: ${FIND} *.1 | ${SED} "s,^,man/man1/,;s/1$$/1.gz/" >> ${TMPPLIST}) @(${FIND} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/PDL* -type f | \ ${SED} "s,^${STAGEDIR}${PREFIX}/,," >> ${TMPPLIST} ; \ - ${FIND} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/PDL -type f | \ - ${SED} "s,^${STAGEDIR}${PREFIX}/,," >> ${TMPPLIST}) + ${FIND} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/PDL -type f \ + -name "[A-Z]*" | ${SED} "s,^${STAGEDIR}${PREFIX}/,," \ + >> ${TMPPLIST}) .include <bsd.port.mk> Modified: head/math/R/Makefile ============================================================================== --- head/math/R/Makefile Wed Mar 25 06:47:03 2015 (r382198) +++ head/math/R/Makefile Wed Mar 25 07:37:15 2015 (r382199) @@ -316,9 +316,6 @@ post-patch: @${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \ ${WRKSRC}/src/nmath/standalone/Makefile.in \ ${WRKSRC}/src/unix/Makefile.in - @${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" \ - ${WRKSRC}/configure \ - ${WRKSRC}/src/scripts/javareconf.in @${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|g" \ ${WRKSRC}/configure \ ${WRKSRC}/src/library/profile/Rprofile.unix \ Modified: head/math/atlas/Makefile ============================================================================== --- head/math/atlas/Makefile Wed Mar 25 06:47:03 2015 (r382198) +++ head/math/atlas/Makefile Wed Mar 25 07:37:15 2015 (r382199) @@ -86,9 +86,8 @@ PLIST_SUB+= ${opt}="@comment " .endfor EXTRA_FLAGS?= -Wl,-rpath=${_GCC_RUNTIME} -SHARED_FLAGS= ${PTHREAD_CFLAGS} ${PICFLAG} -DPIC +SHARED_FLAGS= ${PICFLAG} -DPIC SHARED_LAPACK_WRKSRC= WRKSRC_SHARED -STATIC_FLAGS= ${PTHREAD_CFLAGS} STATIC_LAPACK_WRKSRC= WRKSRC post-patch: @@ -109,8 +108,7 @@ post-patch: @${REINPLACE_CMD} -e "\|OS=ALL|{N; s|'gcc'|'${CC}'|; \ s|'gfortran'|'${FC}'|; s|-mavx|-msse3|;s|'| ${EXTRA_FLAGS}'|4;}" \ ${WRKSRC}/CONFIG/src/atlcomp.txt - @${REINPLACE_CMD} -e "s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|" \ - -e "s|%%CC%%|${CC}|" \ + @${REINPLACE_CMD} -e "s|%%CC%%|${CC}|" \ ${WRKSRC}/CONFIG/src/SpewMakeInc.c @${REINPLACE_CMD} -E -e \ "\|(#define ATL_MaxMalloc[[:blank:]]+)([[:digit:]]+)|s||\1${ATLAS_MAXMALLOC}|" \ @@ -188,7 +186,7 @@ do-build: L1= ${FC} $${F77FLAGS} ${SHARED_FLAGS} ${LDFLAGS} -shared -Wl,-x \ -Wl,--whole-archive -Wl,-soname, -L2= -Wl,--no-whole-archive -Wl,--as-needed ${PTHREAD_LIBS} +L2= -Wl,--no-whole-archive -Wl,--as-needed -lpthread post-build: .for opt in shared static Modified: head/math/atlas/files/patch-CONFIG+src+SpewMakeInc.c ============================================================================== --- head/math/atlas/files/patch-CONFIG+src+SpewMakeInc.c Wed Mar 25 06:47:03 2015 (r382198) +++ head/math/atlas/files/patch-CONFIG+src+SpewMakeInc.c Wed Mar 25 07:37:15 2015 (r382199) @@ -1,6 +1,6 @@ ---- CONFIG/src/SpewMakeInc.c.orig 2011-05-14 13:33:24.000000000 -0400 -+++ CONFIG/src/SpewMakeInc.c 2011-09-06 06:06:00.000000000 -0400 -@@ -399,7 +399,8 @@ +--- CONFIG/src/SpewMakeInc.c.orig 2011-05-14 17:33:24 UTC ++++ CONFIG/src/SpewMakeInc.c +@@ -399,7 +399,8 @@ main(int nargs, char **args) &mhz, &ptrbits, &ncpu, comps, &gccflags, &outfile, &srcdir, &blddir, &USEDEFL1, &USEARCHDEF, &nof77, &f2cdefs, &cdefs, &pmake, &flapack, &smaflags, &dmaflags, &f77lib, &l2size, &targ); @@ -10,7 +10,7 @@ if (!outfile) fpout = stdout; else -@@ -482,7 +483,7 @@ +@@ -482,7 +483,7 @@ main(int nargs, char **args) fprintf(fpout, "# -------------------------------------------------\n"); fprintf(fpout, "# Name indicating the platform to configure BLAS to\n"); fprintf(fpout, "# -------------------------------------------------\n"); @@ -19,7 +19,7 @@ fprintf(fpout, "%d", ptrbits); if (ISAX) fprintf(fpout, "%s", ISAXNAM[ISAX]); -@@ -649,7 +650,7 @@ +@@ -649,7 +650,7 @@ main(int nargs, char **args) comps[i][j-2] == 'c' && comps[i][j-1] == 'c') break; } @@ -28,7 +28,7 @@ fprintf(fpout, " GOODGCC = %s", goodgcc); if (gccflags) fprintf(fpout, " %s", gccflags); -@@ -661,7 +662,7 @@ +@@ -661,7 +662,7 @@ main(int nargs, char **args) fprintf(fpout, " %s", sp); fprintf(fpout, "\n"); @@ -37,7 +37,7 @@ if (MachIsX86(mach)) { if (ptrbits == 32) -@@ -679,7 +680,7 @@ +@@ -679,7 +680,7 @@ main(int nargs, char **args) fprintf(fpout, " FCLINKFLAGS = $(FLINKFLAGS)"); if (strstr(comps[F77_], "ifort") && !OSIsWin(OS)) fprintf(fpout, " -nofor_main"); @@ -46,7 +46,7 @@ fprintf(fpout, " ARFLAGS = r\n"); /* * JF Mertens says that even x86 OS X still need ranlib for safety -@@ -702,14 +703,14 @@ +@@ -702,8 +703,8 @@ main(int nargs, char **args) fprintf(fpout, "# ------------------------------------\n"); fprintf(fpout, "# Reference and system libraries\n"); fprintf(fpout, "# ------------------------------------\n"); @@ -57,10 +57,3 @@ fprintf(fpout, " FLAPACKlib = "); if (flapack) fprintf(fpout, "%s", flapack); fprintf(fpout, "\n"); - fprintf(fpout, " SLAPACKlib = \n"); - if (THREADS) -- fprintf(fpout, " LIBS = -lpthread"); -+ fprintf(fpout, " LIBS = %%PTHREAD_LIBS%%"); - else - fprintf(fpout, " LIBS ="); - if (!OSIsWin(OS)) Modified: head/math/fityk/Makefile ============================================================================== --- head/math/fityk/Makefile Wed Mar 25 06:47:03 2015 (r382198) +++ head/math/fityk/Makefile Wed Mar 25 07:37:15 2015 (r382199) @@ -37,9 +37,9 @@ PORTDOCS= * CFLAGS+= -D_GNU_SOURCE CPPFLAGS+= -I${WRKDIR}/${XYLIB_DISTNAME} \ - -I${LOCALBASE}/include ${PTHREAD_CFLAGS} + -I${LOCALBASE}/include LDFLAGS+= -L${WRKDIR}/${XYLIB_DISTNAME}/xylib/.libs \ - -L${LOCALBASE}/lib ${PTHREAD_LIBS} + -lpthread -L${LOCALBASE}/lib XYLIB_DISTNAME= xylib-1.1 Modified: head/math/graphthing/Makefile ============================================================================== --- head/math/graphthing/Makefile Wed Mar 25 06:47:03 2015 (r382198) +++ head/math/graphthing/Makefile Wed Mar 25 07:37:15 2015 (r382199) @@ -22,9 +22,7 @@ GNU_CONFIGURE= yes MAKEFILE= GNUmakefile PLIST_FILES= bin/graphthing bin/gt - -CPPFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} +LDFLAGS+= -lpthread post-patch: @${REINPLACE_CMD} -e \ Modified: head/math/lapacke/Makefile ============================================================================== --- head/math/lapacke/Makefile Wed Mar 25 06:47:03 2015 (r382198) +++ head/math/lapacke/Makefile Wed Mar 25 07:37:15 2015 (r382199) @@ -53,14 +53,12 @@ LIB_DEPENDS+= libblas.so:${PORTSDIR}/mat BLAS= -lblas LAPACK= -llapack .elif ${WITH_BLAS} == "gotoblas" -CFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} +LDFLAGS+= -lpthread LIB_DEPENDS+= libgoto2p.so:${PORTSDIR}/math/gotoblas BLAS= -lgoto2p LAPACK= -lgoto2p .elif ${WITH_BLAS} == "atlas" -CFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} +LDFLAGS+= -lpthread LIB_DEPENDS+= libatlas.so:${PORTSDIR}/math/atlas BLAS= -lptf77blas LAPACK= -lalapack -lptcblas Modified: head/math/levmar/Makefile ============================================================================== --- head/math/levmar/Makefile Wed Mar 25 06:47:03 2015 (r382198) +++ head/math/levmar/Makefile Wed Mar 25 07:37:15 2015 (r382199) @@ -35,14 +35,12 @@ LIB_DEPENDS+= libblas.so:${PORTSDIR}/mat BLAS= -lblas LAPACK= -llapack .elif ${WITH_BLAS} == "gotoblas" -CFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib +LDFLAGS+= -lpthread -L${LOCALBASE}/lib LIB_DEPENDS+= libgoto2p.so:${PORTSDIR}/math/gotoblas BLAS= -lgoto2p LAPACK= -lgoto2p .elif ${WITH_BLAS} == "atlas" -CFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib +LDFLAGS+= -lpthread -L${LOCALBASE}/lib LIB_DEPENDS+= libatlas.so:${PORTSDIR}/math/atlas BLAS= -lptf77blas LAPACK= -lalapack -lptcblas Modified: head/math/libflame/Makefile ============================================================================== --- head/math/libflame/Makefile Wed Mar 25 06:47:03 2015 (r382198) +++ head/math/libflame/Makefile Wed Mar 25 07:37:15 2015 (r382199) @@ -174,8 +174,6 @@ CFLAGS+= ${OPENMP_CFLAGS} LDFLAGS+= ${OPENMP_CFLAGS} CONFIGURE_ARGS+= --enable-multithreading=openmp .elif ${PORT_OPTIONS:MTHREADS} -CFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_CFLAGS} CONFIGURE_ARGS+= --enable-multithreading=pthreads .else CONFIGURE_ARGS+= --enable-multithreading=no @@ -243,7 +241,6 @@ post-patch: -e 's@(#!)(/bin/bash)@\1${LOCALBASE}\2@' @${FIND} ${WRKSRC} -type f \( -name 'makefile' -o -name 'config.mk.in' \) | \ ${XARGS} ${REINPLACE_CMD} \ - -e 's@-lpthread@${PTHREAD_LIBS}@g' \ -e 's@-fPIC@${PICFLAG}@g' @${REINPLACE_CMD} \ -e '\@MK_INCL_DIR_INST_W_ARCH_VERS[[:blank:]]*:=@ \ Modified: head/math/libocas/Makefile ============================================================================== --- head/math/libocas/Makefile Wed Mar 25 06:47:03 2015 (r382198) +++ head/math/libocas/Makefile Wed Mar 25 07:37:15 2015 (r382199) @@ -16,7 +16,7 @@ USES= gmake zip USE_LDCONFIG= yes ALL_TARGET= clean libocas.so.1 svmocas msvmocas linclassif -CLIBS= -lm ${PTHREAD_LIBS} +CLIBS= -lm -lpthread MAKE_ENV= CLIBS="${CLIBS}" MEXDETECTED=no PLIST_FILES= bin/linclassif bin/msvmocas bin/svmocas lib/libocas.so \ @@ -30,7 +30,7 @@ PICFLAG= -fPIC PICFLAG= -fpic .endif -CFLAGS+= ${PICFLAG} ${PTHREAD_CFLAGS} +CFLAGS+= ${PICFLAG} post-patch: @${REINPLACE_CMD} \ Modified: head/math/libproj4/Makefile ============================================================================== --- head/math/libproj4/Makefile Wed Mar 25 06:47:03 2015 (r382198) +++ head/math/libproj4/Makefile Wed Mar 25 07:37:15 2015 (r382199) @@ -34,9 +34,6 @@ LIB_DEPENDS+= libmissing.so:${PORTSDIR}/ LDFLAGS+= -lmissing .endif -pre-configure: - ${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/${MAKEFILE} - post-install: .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/math/mumps/Makefile ============================================================================== --- head/math/mumps/Makefile Wed Mar 25 06:47:03 2015 (r382198) +++ head/math/mumps/Makefile Wed Mar 25 07:37:15 2015 (r382199) @@ -106,7 +106,6 @@ pre-build: s+@FCFLAGS@+${FCFLAGS}+g; \ s+@GCCLIBDIR@+${GCCLIBDIR}+g; \ s+@FORTRANLIBS@+${FORTRANLIBS}+g; \ - s+@PTHREAD_LIBS@+${PTHREAD_LIBS}+g; \ s+@BLAS_LIBS@+${BLAS_LIBS}+ ; \ s+@LOCALBASE@+${LOCALBASE}+g;' \ ${WRKSRC}/Makefile.inc Modified: head/math/mumps/files/patch-Make.inc+Makefile.inc.generic ============================================================================== --- head/math/mumps/files/patch-Make.inc+Makefile.inc.generic Wed Mar 25 06:47:03 2015 (r382198) +++ head/math/mumps/files/patch-Make.inc+Makefile.inc.generic Wed Mar 25 07:37:15 2015 (r382199) @@ -68,7 +68,7 @@ # DEFINE YOUR PTHREAD LIBRARY -LIBOTHERS = -lpthread -+LIBOTHERS = @PTHREAD_LIBS@ @GCCLIBDIR@ @FORTRANLIBS@ ++LIBOTHERS = -lpthread @GCCLIBDIR@ @FORTRANLIBS@ # FORTRAN/C COMPATIBILITY: # Use: Modified: head/math/mumps/files/patch-Make.inc+Makefile.inc.generic.SEQ ============================================================================== --- head/math/mumps/files/patch-Make.inc+Makefile.inc.generic.SEQ Wed Mar 25 06:47:03 2015 (r382198) +++ head/math/mumps/files/patch-Make.inc+Makefile.inc.generic.SEQ Wed Mar 25 07:37:15 2015 (r382199) @@ -56,7 +56,7 @@ # DEFINE HERE YOUR PTHREAD LIBRARY -LIBOTHERS = -lpthread -+LIBOTHERS = @PTHREAD_LIBS@ @GCCLIBDIR@ @FORTRANLIBS@ ++LIBOTHERS = -lpthread @GCCLIBDIR@ @FORTRANLIBS@ # FORTRAN/C COMPATIBILITY: # Use: Modified: head/math/sage/Makefile ============================================================================== --- head/math/sage/Makefile Wed Mar 25 06:47:03 2015 (r382198) +++ head/math/sage/Makefile Wed Mar 25 07:37:15 2015 (r382199) @@ -54,7 +54,7 @@ LATEST_LINK= sage-math # Conflicts with MAKE_ARGS+= ARCH="${AR}" post-patch: - ${REINPLACE_CMD} 's/$$MAKE $$gettext/$$MAKE PTHREAD_LIBS=${PTHREAD_LIBS} $$gettext/' ${WRKSRC}/build/pkgs/git/spkg-install + ${REINPLACE_CMD} 's/$$MAKE $$gettext/$$MAKE PTHREAD_LIBS=-lpthread $$gettext/' ${WRKSRC}/build/pkgs/git/spkg-install # Create wrapper for invocation of make. @${MKDIR} ${WRKSRC}/local/bin Modified: head/math/sdpara/Makefile ============================================================================== --- head/math/sdpara/Makefile Wed Mar 25 06:47:03 2015 (r382198) +++ head/math/sdpara/Makefile Wed Mar 25 07:37:15 2015 (r382199) @@ -64,7 +64,6 @@ post-patch: s|%%BLAS%%|${BLAS}|g ; \ s|%%LAPACK%%|${LAPACK}|g ; \ s|%%SCALAPACK%%|${SCALAPACK}|g ; \ - s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|g ; \ s|%%FORTRAN_LIBS%%|${GCCLIBDIR} ${FORTRAN_LIBS}|g ' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's|%%MPICC%%|${LOCALBASE}/bin/mpicc|g ; \ s|%%MPICXX%%|${LOCALBASE}/bin/mpicxx|g ; \ Modified: head/math/sdpara/files/patch-Makefile ============================================================================== --- head/math/sdpara/files/patch-Makefile Wed Mar 25 06:47:03 2015 (r382198) +++ head/math/sdpara/files/patch-Makefile Wed Mar 25 07:37:15 2015 (r382199) @@ -1,6 +1,6 @@ ---- Makefile.orig 2009-01-09 02:26:29.000000000 +0000 +--- Makefile.orig 2009-01-09 02:26:29 UTC +++ Makefile -@@ -4,20 +4,20 @@ +@@ -4,19 +4,19 @@ # you edit here along your environment ############################################################ @@ -17,7 +17,6 @@ -SCALAPACK_LIBS = /usr/local/scalapack/lib/libscalapack.a /usr/local/BLACS/LIB/blacs_MPI-LINUX-0.a /usr/local/BLACS/LIB/blacsCinit_MPI-LINUX-0.a /usr/local/BLACS/LIB/blacs_MPI-LINUX-0.a - -FORTRAN_LIBS = -lgfortran --PTHERAD_LIBS = -lpthread +CC = %%MPICC%% +CXX = %%MPICXX%% +F77 = %%MPIF77%% @@ -31,11 +30,10 @@ +SCALAPACK_LIBS = %%SCALAPACK%% + +FORTRAN_LIBS = %%FORTRAN_LIBS%% -+PTHERAD_LIBS = %%PTHREAD_LIBS%% + PTHERAD_LIBS = -lpthread # F77_FUNC - DEF_F77_FUNC = -DF77_FUNC\(name,NAME\)=name\ \#\#\ _ -@@ -82,10 +82,10 @@ cleanall: clean mumps-clean +@@ -82,10 +82,10 @@ cleanall: clean mumps-clean force: cleanall all mumps: Modified: head/math/spooles/Makefile ============================================================================== --- head/math/spooles/Makefile Wed Mar 25 06:47:03 2015 (r382198) +++ head/math/spooles/Makefile Wed Mar 25 07:37:15 2015 (r382199) @@ -60,8 +60,12 @@ do-extract: post-patch: ${MKDIR} ${WRKSRC}_SHARED ; ${CP} -r ${WRKSRC}/* ${WRKSRC}_SHARED - @${REINPLACE_CMD} -e 's+%%LOCALBASE%%+${LOCALBASE}+g;' -e 's+%%CFLAGS%%+${PTHREAD_CFLAGS} ${CFLAGS}+g;' -e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g;' -e 's+%%CC%%+${CC}+g;' ${WRKSRC}/Make.inc - @${REINPLACE_CMD} -e 's+%%LOCALBASE%%+${LOCALBASE}+g;' -e 's+%%CFLAGS%%+${CFLAGS} ${PTHREAD_CFLAGS} ${PICFLAG}+g;' -e 's+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g;' -e 's+%%CC%%+${CC}+g;' ${WRKSRC}_SHARED/Make.inc + @${REINPLACE_CMD} -e 's+%%LOCALBASE%%+${LOCALBASE}+g;' \ + -e 's+%%CFLAGS%%+${CFLAGS}+g;' \ + -e 's+%%CC%%+${CC}+g;' ${WRKSRC}/Make.inc + @${REINPLACE_CMD} -e 's+%%LOCALBASE%%+${LOCALBASE}+g;' \ + -e 's+%%CFLAGS%%+${CFLAGS} ${PICFLAG}+g;' \ + -e 's+%%CC%%+${CC}+g;' ${WRKSRC}_SHARED/Make.inc do-build: .if defined(WITH_MPI) Modified: head/math/spooles/files/patch-Make.inc ============================================================================== --- head/math/spooles/files/patch-Make.inc Wed Mar 25 06:47:03 2015 (r382198) +++ head/math/spooles/files/patch-Make.inc Wed Mar 25 07:37:15 2015 (r382199) @@ -42,7 +42,7 @@ # THREAD_LIBS = -# THREAD_LIBS = -D_REENTRANT=199506L -lpthread - THREAD_LIBS = -D_POSIX_C_SOURCE=199506L -lpthread -+THREAD_LIBS = -D_REENTRANT=199506L %%PTHREAD_LIBS%% ++THREAD_LIBS = -D_REENTRANT=199506L -lpthread +# THREAD_LIBS = -D_POSIX_C_SOURCE=199506L -lpthread # THREAD_LIBS = -lpthread # Modified: head/math/suitesparse/Makefile ============================================================================== --- head/math/suitesparse/Makefile Wed Mar 25 06:47:03 2015 (r382198) +++ head/math/suitesparse/Makefile Wed Mar 25 07:37:15 2015 (r382199) @@ -40,7 +40,6 @@ RESTRICTED= GPL and METIS licenses are c CONFLICTS= umfpack-* -CFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib .include <bsd.port.options.mk> Modified: head/math/superlu_mt/Makefile ============================================================================== --- head/math/superlu_mt/Makefile Wed Mar 25 06:47:03 2015 (r382198) +++ head/math/superlu_mt/Makefile Wed Mar 25 07:37:15 2015 (r382199) @@ -73,9 +73,7 @@ post-patch: s+%%CFLAGS%%+${CFLAGS}+; \ s+%%FFLAGS%%+${FFLAGS}+; \ s+%%LDFLAGS%%+${LDFLAGS}+; \ - s+%%FPIC%%++; \ - s+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+ ; \ - s+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+ ' \ + s+%%FPIC%%++ ' \ ${WRKSRC}/make.inc @${REINPLACE_CMD} -e 's+%%BLAS%%+-L${LOCALBASE}/lib ${BLAS}+ ; \ @@ -84,9 +82,7 @@ post-patch: s+%%CFLAGS%%+${CFLAGS} ${FPIC}+; \ s+%%FFLAGS%%+${FFLAGS} ${FPIC}+; \ s+%%LDFLAGS%%+${LDFLAGS}+; \ - s+%%FPIC%%+${FPIC}+; \ - s+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+ ; \ - s+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+ ' \ + s+%%FPIC%%+${FPIC}+ ' \ ${WRKSRC_SHARED}/make.inc do-build: Modified: head/math/superlu_mt/files/patch-make.inc ============================================================================== --- head/math/superlu_mt/files/patch-make.inc Wed Mar 25 06:47:03 2015 (r382198) +++ head/math/superlu_mt/files/patch-make.inc Wed Mar 25 07:37:15 2015 (r382199) @@ -1,5 +1,5 @@ ---- make.inc Fri Jan 18 05:53:51 2008 -+++ make.inc Thu Jul 3 12:47:55 2008 +--- make.inc.orig 2008-02-22 22:45:36 UTC ++++ make.inc @@ -16,13 +16,13 @@ # # The machine (platform) identifier to append to the library names @@ -17,7 +17,7 @@ # # If you don't have ESSL, you can use the following blaslib instead: -@@ -30,10 +30,10 @@ +@@ -30,7 +30,7 @@ SUPERLULIB = libsuperlu_mt$(PLAT).a # which may be slower than ESSL # BLASDEF = -DUSE_VENDOR_BLAS @@ -25,12 +25,17 @@ +BLASLIB = %%BLAS%% #BLASLIB = ../lib/libblas$(PLAT).a MATHLIB = -lm --MPLIB = -lpthread -+MPLIB = %%PTHREAD_LIBS%% - + MPLIB = -lpthread +@@ -38,7 +38,7 @@ MPLIB = -lpthread # The archiver and the flag(s) to use when building archive (library) # If your system has no ranlib, set RANLIB = echo. -@@ -46,16 +46,17 @@ + # +-ARCH = ar ++ARCMD = ar + ARCHFLAGS = cr + RANLIB = ranlib + +@@ -46,16 +46,17 @@ RANLIB = ranlib PREDEFS = -D_PTHREAD # @@ -41,7 +46,7 @@ -LOADER = xlc_r -LOADOPTS = -bmaxdata:0x80000000 +CC = %%CC%% -+CFLAGS = $(PREDEFS) %%CPPFLAGS%% %%CFLAGS%% %%PTHREAD_CFLAGS%% ++CFLAGS = $(PREDEFS) %%CPPFLAGS%% %%CFLAGS%% +FORTRAN = %%FC%% +FFLAGS = %%FFLAGS%% +LOADER = %%CC%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503250737.t2P7bFDn001028>