FreeBSD Bugzilla – Attachment 228254 Details for
Bug 258781
cad/scotch: Update to 6.1.1
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch
scotch.patch (text/plain), 12.89 KB, created by
Yuri Victorovich
on 2021-09-29 16:48:48 UTC
(
hide
)
Description:
patch
Filename:
MIME Type:
Creator:
Yuri Victorovich
Created:
2021-09-29 16:48:48 UTC
Size:
12.89 KB
patch
obsolete
>diff --git a/cad/scotch/Makefile b/cad/scotch/Makefile >index 97858c445ae2..09eddffa76ef 100644 >--- a/cad/scotch/Makefile >+++ b/cad/scotch/Makefile >@@ -1,8 +1,7 @@ > # Created by: thierry@pompo.net > > PORTNAME= scotch >-DISTVERSION= 6.0.4-aster7 >-PORTREVISION= 3 >+DISTVERSION= 6.1.1 > CATEGORIES= cad science > > MAINTAINER= thierry@FreeBSD.org >@@ -10,11 +9,15 @@ COMMENT= Package for graph and mesh partitioning and sparse matrix ordering > > LICENSE= CeCILL_C > LICENSE_NAME= CeCILL-C >-LICENSE_FILE= ${WRKSRC}/doc/CeCILL-C_V1-en.txt >+LICENSE_FILE= ${WRKSRC}/../doc/CeCILL-C_V1-en.txt > LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept > > USES= bison:alias gmake localbase > >+USE_GITLAB= yes >+GL_SITE= https://gitlab.inria.fr >+GL_COMMIT= 1603edaecec7baa809b583f4c0c21d94df6c44e2 >+ > CONFLICTS= gbase-0.* gmap-2015.* > > MAKE_JOBS_UNSAFE=yes >@@ -23,22 +26,23 @@ OPTIONS_DEFINE= DOCS EXAMPLES MPICH > OPTIONS_DEFAULT=MPICH > OPTIONS_SUB= yes > >-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} >-BUILD_WRKSRC= ${WRKSRC}/src >-INSTALL_WRKSRC= ${BUILD_WRKSRC} >-TEST_WRKSRC= ${BUILD_WRKSRC} >-ALL_TARGET= esmumps >+WRKSRC_SUBDIR= src >+ > TEST_TARGET= check > MAKE_ENV= prefix=${STAGEDIR}${PREFIX} mandir=${STAGEDIR}${PREFIX}/share/man \ > -DSCOTCH_PTHREAD_NUMBER=2 > USE_LDCONFIG= yes > >-DOCVER= ${PORTVERSION:R:R} >+DOCVER= ${PORTVERSION:R} > PORTDOCS= ptscotch_user${DOCVER}.pdf scotch_user${DOCVER}.pdf scotch_example.f >-LIBS= esmumps scotch scotcherr scotcherrexit scotchmetis >+LIBS= scotcherr scotcherrexit scotch scotchmetis >+LIBS_PT= ptscotch ptscotchparmetis ptscotcherrexit ptesmumps ptscotcherr >+ >+PORTEXAMPLES= * > > MPICH_USES= mpi:mpich > MPICH_ALL_TARGET= ptesmumps >+MPICH_ALL_TARGET_OFF= esmumps > MPICH_TEST_TARGET= ptcheck > MPICH_LIBS+= ptesmumps ptscotch ptscotcherr ptscotcherrexit ptscotchparmetis > >@@ -59,11 +63,11 @@ pre-everything:: > > pre-configure: > ${REINPLACE_CMD} -e 's/-lthread/-pthread/;s/-lpthread/-pthread/'\ >- ${WRKSRC}/src/Make.inc/Makefile.inc.${MF}_pc_freebsd >- ${LN} -sf ${WRKSRC}/src/Make.inc/Makefile.inc.${MF}_pc_freebsd \ >- ${WRKSRC}/src/Makefile.inc >+ ${WRKSRC}/Make.inc/Makefile.inc.${MF}_pc_freebsd >+ ${LN} -sf ${WRKSRC}/Make.inc/Makefile.inc.${MF}_pc_freebsd \ >+ ${WRKSRC}/Makefile.inc > ${REINPLACE_CMD} -E -e 's|cd (.*) ; * \$$\(MAKE\)|\$$(MAKE) -C \1|' \ >- -e 's|\&\& \$$\(MAKE\)||' ${WRKSRC}/src/Makefile >+ -e 's|\&\& \$$\(MAKE\)||' ${WRKSRC}/Makefile > > post-stage: > ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/lib* >@@ -72,14 +76,25 @@ post-stage: > ${LN} -sf lib${l}.so.0 ${STAGEDIR}${PREFIX}/lib/lib${l}.so > .endfor > >+post-stage-MPICH: >+.for l in ${LIBS_PT} >+ ${MV} ${STAGEDIR}${PREFIX}/lib/lib${l}.so ${STAGEDIR}${PREFIX}/lib/lib${l}.so.0 >+ ${LN} -sf lib${l}.so.0 ${STAGEDIR}${PREFIX}/lib/lib${l}.so >+.endfor >+post-stage-MPICH-off: >+.for l in esmumps >+ ${MV} ${STAGEDIR}${PREFIX}/lib/lib${l}.so ${STAGEDIR}${PREFIX}/lib/lib${l}.so.0 >+ ${LN} -sf lib${l}.so.0 ${STAGEDIR}${PREFIX}/lib/lib${l}.so >+.endfor >+ > do-install-DOCS-on: > ${MKDIR} ${STAGEDIR}${DOCSDIR} >- ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR} >+ ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/../doc/|} ${STAGEDIR}${DOCSDIR} > > do-install-EXAMPLES-on: > ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/grf ${STAGEDIR}${EXAMPLESDIR}/tgt >- ${INSTALL_DATA} ${WRKSRC}/grf/* ${STAGEDIR}${EXAMPLESDIR}/grf >- ${INSTALL_DATA} ${WRKSRC}/tgt/* ${STAGEDIR}${EXAMPLESDIR}/tgt >+ ${INSTALL_DATA} ${WRKSRC}/../grf/* ${STAGEDIR}${EXAMPLESDIR}/grf >+ ${INSTALL_DATA} ${WRKSRC}/../tgt/* ${STAGEDIR}${EXAMPLESDIR}/tgt > > .if !defined(WITHOUT_MPI) > pre-test: >@@ -90,5 +105,4 @@ pre-test: > . endif > .endif > >-.include "${.CURDIR}/../../french/aster/bsd.aster.mk" > .include <bsd.port.mk> >diff --git a/cad/scotch/distinfo b/cad/scotch/distinfo >new file mode 100644 >index 000000000000..e2b0df2c46b0 >--- /dev/null >+++ b/cad/scotch/distinfo >@@ -0,0 +1,3 @@ >+TIMESTAMP = 1632930451 >+SHA256 (scotch-scotch-1603edaecec7baa809b583f4c0c21d94df6c44e2_GL0.tar.gz) = caca096e0e74e7412620e2d520bb90f1f82001f1beccbaa4c031fcce09d14c8f >+SIZE (scotch-scotch-1603edaecec7baa809b583f4c0c21d94df6c44e2_GL0.tar.gz) = 6366013 >diff --git a/cad/scotch/files/patch-src_Make.inc_Makefile.inc.i686__pc__freebsd b/cad/scotch/files/patch-Make.inc_Makefile.inc.i686__pc__freebsd >similarity index 62% >rename from cad/scotch/files/patch-src_Make.inc_Makefile.inc.i686__pc__freebsd >rename to cad/scotch/files/patch-Make.inc_Makefile.inc.i686__pc__freebsd >index 53ddec35d372..42ba3235280a 100644 >--- a/cad/scotch/files/patch-src_Make.inc_Makefile.inc.i686__pc__freebsd >+++ b/cad/scotch/files/patch-Make.inc_Makefile.inc.i686__pc__freebsd >@@ -1,5 +1,5 @@ >---- src/Make.inc/Makefile.inc.i686_pc_freebsd.orig 2017-02-22 07:20:57 UTC >-+++ src/Make.inc/Makefile.inc.i686_pc_freebsd >+--- Make.inc/Makefile.inc.i686_pc_freebsd.orig 2021-06-23 09:32:34 UTC >++++ Make.inc/Makefile.inc.i686_pc_freebsd > @@ -1,21 +1,21 @@ > EXE = > -LIB = .a >@@ -16,17 +16,16 @@ > +CCS = $(CC) > CCP = mpicc > -CCD = mpicc >--CFLAGS += -std=c99 -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_PTHREAD -DSCOTCH_RENAME -DSCOTCH_RENAME_PARSER >+-CFLAGS += -std=c99 -fPIC -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_PTHREAD -DSCOTCH_RENAME -DSCOTCH_RENAME_PARSER > -CLIBFLAGS = >--LDFLAGS += -lz -lm -lpthread > +CCD = $(CC) > +CFLAGS += -std=c99 -fPIC -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_PTHREAD -DSCOTCH_RENAME -DSCOTCH_RENAME_PARSER -DIDXSIZE64 -DINTSIZE64 > +CLIBFLAGS = -fPIC >-+LDFLAGS += -lz -lm -lthread >+ LDFLAGS += -lz -lm -lpthread > CP = cp > LEX = flex -Pscotchyy -olex.yy.c > LN = ln >- MKDIR = mkdir >+ MKDIR = mkdir -p > MV = mv > -RANLIB = ranlib > +RANLIB = echo >diff --git a/cad/scotch/files/patch-src_Make.inc_Makefile.inc.x86-64__pc__freebsd b/cad/scotch/files/patch-Make.inc_Makefile.inc.x86-64__pc__freebsd >similarity index 76% >rename from cad/scotch/files/patch-src_Make.inc_Makefile.inc.x86-64__pc__freebsd >rename to cad/scotch/files/patch-Make.inc_Makefile.inc.x86-64__pc__freebsd >index 578e412980de..c8ecd1687a92 100644 >--- a/cad/scotch/files/patch-src_Make.inc_Makefile.inc.x86-64__pc__freebsd >+++ b/cad/scotch/files/patch-Make.inc_Makefile.inc.x86-64__pc__freebsd >@@ -1,6 +1,6 @@ >---- src/Make.inc/Makefile.inc.x86-64_pc_freebsd.orig 2017-02-22 07:20:57 UTC >-+++ src/Make.inc/Makefile.inc.x86-64_pc_freebsd >-@@ -1,21 +1,21 @@ >+--- Make.inc/Makefile.inc.x86-64_pc_freebsd.orig 2021-06-23 09:32:34 UTC >++++ Make.inc/Makefile.inc.x86-64_pc_freebsd >+@@ -1,15 +1,15 @@ > EXE = > -LIB = .a > +LIB = .so >@@ -17,15 +17,14 @@ > CCP = mpicc > -CCD = cc > -CFLAGS += -std -fPIC -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_RENAME_PARSER -DSCOTCH_PTHREAD -Drestrict=__restrict -DIDXSIZE64 >--CLIBFLAGS = > +CCD = $(CC) > +CFLAGS += -std=c99 -fPIC -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_RENAME_PARSER -DSCOTCH_PTHREAD -Drestrict=__restrict -DIDXSIZE64 -DINTSIZE64 >-+CLIBFLAGS = -fPIC >+ CLIBFLAGS = > LDFLAGS += -lz -lm -lthread > CP = cp >- LEX = flex -Pscotchyy -olex.yy.c >+@@ -17,5 +17,5 @@ LEX = flex -Pscotchyy -olex.yy.c > LN = ln >- MKDIR = mkdir >+ MKDIR = mkdir -p > MV = mv > -RANLIB = ranlib > +RANLIB = echo >diff --git a/cad/scotch/pkg-descr b/cad/scotch/pkg-descr >index d80e828f5920..fc6f4c1fc9ef 100644 >--- a/cad/scotch/pkg-descr >+++ b/cad/scotch/pkg-descr >@@ -10,4 +10,4 @@ The SCOTCH distribution is a set of programs and libraries which implement the > static mapping and sparse matrix reordering algorithms developed within the > SCOTCH project. > >-WWW: http://www.labri.fr/perso/pelegrin/scotch/ >+WWW: https://www.labri.fr/perso/pelegrin/scotch/ >diff --git a/cad/scotch/pkg-plist b/cad/scotch/pkg-plist >index 3aa73ad1fb13..939ea3fe011d 100644 >--- a/cad/scotch/pkg-plist >+++ b/cad/scotch/pkg-plist >@@ -14,6 +14,7 @@ bin/atst > %%MPICH%%bin/dgtst > bin/gbase > bin/gcv >+bin/gdump > bin/gmap > bin/gmk_hy > bin/gmk_m2 >@@ -32,12 +33,11 @@ bin/mmk_m2 > bin/mmk_m3 > bin/mord > bin/mtst >+include/esmumps.h > %%MPICH%%include/ptscotch.h > %%MPICH%%include/ptscotchf.h > include/scotch.h > include/scotchf.h >-lib/libesmumps.so >-lib/libesmumps.so.0 > %%MPICH%%lib/libptesmumps.so > %%MPICH%%lib/libptesmumps.so.0 > %%MPICH%%lib/libptscotch.so >@@ -48,6 +48,8 @@ lib/libesmumps.so.0 > %%MPICH%%lib/libptscotcherrexit.so.0 > %%MPICH%%lib/libptscotchparmetis.so > %%MPICH%%lib/libptscotchparmetis.so.0 >+%%NO_MPICH%%lib/libesmumps.so >+%%NO_MPICH%%lib/libesmumps.so.0 > lib/libscotch.so > lib/libscotch.so.0 > lib/libscotcherr.so >@@ -56,108 +58,26 @@ lib/libscotcherrexit.so > lib/libscotcherrexit.so.0 > lib/libscotchmetis.so > lib/libscotchmetis.so.0 >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/3elt.grf.gz >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/3elt.xyz.gz >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/4elt.grf.gz >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/4elt.xyz.gz >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/4elt2.grf.gz >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/4elt2.xyz.gz >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/bump.grf.gz >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/bump.xyz.gz >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/SP2_16.txt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/T3D_64.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h1.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h10.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h2.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h3.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h4.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h5.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h6.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h7.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h8.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h9.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k1.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k12.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k128.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k16.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k2.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k24.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k256.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k32.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k4.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k48.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k512.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k6.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k64.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k7.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k8.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k96.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m10x10.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m10x20.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m11x13.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m16x16.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m16x32.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m17x19.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m19x21.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m19x31.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m21x23.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m23x25.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m24x24.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m25x27.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m27x29.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m29x31.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m2x2.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m2x4x8.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m32x32.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m3x3.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m4x4.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m4x8.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m5x5.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m5x7.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m64x64.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m8x16.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m8x8.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m9x11.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m9x7.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/p128.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/p16.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/p2.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/p256.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/p32.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/p4.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/p512.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/p64.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/p8.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/t2x4x8.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/t4x4x4.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/vcmplt.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/vhcub.tgt >-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/void.tgt >+share/man/man1/acpl.1.gz > share/man/man1/amk_ccc.1.gz >-share/man/man1/amk_fft2.1.gz >-share/man/man1/amk_hy.1.gz >-share/man/man1/amk_m2.1.gz >-share/man/man1/amk_p2.1.gz >+share/man/man1/amk_grf.1.gz > share/man/man1/atst.1.gz > share/man/man1/dgmap.1.gz > share/man/man1/dgord.1.gz >-share/man/man1/dgpart.1.gz > share/man/man1/dgscat.1.gz > share/man/man1/dgtst.1.gz >+share/man/man1/gbase.1.gz > share/man/man1/gcv.1.gz >+share/man/man1/gdump.1.gz > share/man/man1/gmap.1.gz > share/man/man1/gmk_hy.1.gz >-share/man/man1/gmk_m2.1.gz >-share/man/man1/gmk_m3.1.gz > share/man/man1/gmk_msh.1.gz >-share/man/man1/gmk_ub2.1.gz > share/man/man1/gmtst.1.gz > share/man/man1/gord.1.gz > share/man/man1/gotst.1.gz > share/man/man1/gout.1.gz >-share/man/man1/gpart.1.gz > share/man/man1/gtst.1.gz >+share/man/man1/mcv.1.gz > share/man/man1/mmk_m2.1.gz >-share/man/man1/mmk_m3.1.gz > share/man/man1/mord.1.gz > share/man/man1/mtst.1.gz
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 258781
: 228254