commit: ce059d82f9dde19a8a4a286f8b44061e4af32a11 Author: Nicholas Vinson <nvinson234 <AT> gmail <DOT> com> AuthorDate: Mon Jan 2 18:33:49 2017 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Mon Jan 2 20:00:47 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce059d82
sci-libs/scotch: Add flex-2.6.3 compatibility patch Flex-2.6.3 changed and is different from the behavior shown in 2.6.1 and older. The behaviorial differences prevent scotch from building with 2.6.3. This patch adds code to detect 2.6.3 or newer and apply fixes that correctly reflect the new flex behavior. Package-Manager: Portage-2.3.3, Repoman-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/3307 .../scotch/files/scotch-6.0.4-flex-2.6.3-fix.patch | 33 ++++ sci-libs/scotch/scotch-6.0.4-r2.ebuild | 173 +++++++++++++++++++++ 2 files changed, 206 insertions(+) diff --git a/sci-libs/scotch/files/scotch-6.0.4-flex-2.6.3-fix.patch b/sci-libs/scotch/files/scotch-6.0.4-flex-2.6.3-fix.patch new file mode 100644 index 00000000..c1301f5 --- /dev/null +++ b/sci-libs/scotch/files/scotch-6.0.4-flex-2.6.3-fix.patch @@ -0,0 +1,33 @@ +--- scotch_6.0.4/src/libscotch/parser_ll.l.old 2017-01-02 08:42:41.216249106 -0800 ++++ scotch-6.0.4-r1/work/scotch_6.0.4/src/libscotch/parser_ll.l 2017-01-02 09:50:14.572579444 -0800 +@@ -84,20 +84,29 @@ + #endif /* X_OSDOS */ + + #ifdef FLEX_SCANNER + #define YY_ALWAYS_INTERACTIVE 1 /* Set the parser as interactive and read one char at a time */ + #define YY_INPUT(buf,result,max_size) { int c = stratParserInput (); result = (c == 0) ? YY_NULL : ((buf)[0] = c, 1); } ++ ++# if YY_FLEX_MAJOR_VERSION > 2 || \ ++ YY_FLEX_MAJOR_VERSION == 2 && YY_FLEX_MINOR_VERSION > 6 || \ ++ YY_FLEX_MAJOR_VERSION == 2 && YY_FLEX_MINOR_VERSION == 6 && YY_FLEX_SUBMINOR_VERSION >= 3 ++ int yywrap() { return 1; } ++# else ++# define yywrap() (1) /* Always return end-of-file on end-of-string */ ++# endif ++ + #else /* FLEX_SCANNER */ + #undef getc /* Redirect I/O functions */ + #define getc yygetc + #undef yygetc + #define yygetc(stream) stratParserInput () ++#define yywrap() (1) /* Always return end-of-file on end-of-string */ + #endif /* FLEX_SCANNER */ + + #define YY_NO_UNPUT /* No prototype for yyunput as not defined */ + #define YY_SKIP_YYWRAP /* No prototype for yywrap as defined as macro */ +-#define yywrap() (1) /* Always return end-of-file on end-of-string */ + + /* + ** The static variables. + */ + diff --git a/sci-libs/scotch/scotch-6.0.4-r2.ebuild b/sci-libs/scotch/scotch-6.0.4-r2.ebuild new file mode 100644 index 00000000..df015cf --- /dev/null +++ b/sci-libs/scotch/scotch-6.0.4-r2.ebuild @@ -0,0 +1,173 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils toolchain-funcs versionator flag-o-matic multilib + +# use esmumps version to allow linking with mumps +MYP="${PN}_${PV}_esmumps" +# download id on gforge changes every goddamn release +DID=34618 +SOVER=$(get_major_version) + +DESCRIPTION="Software for graph, mesh and hypergraph partitioning" +HOMEPAGE="http://www.labri.u-bordeaux.fr/perso/pelegrin/scotch/"; +SRC_URI="http://gforge.inria.fr/frs/download.php/${DID}/${MYP}.tar.gz"; + +LICENSE="CeCILL-2" +SLOT="0/${SOVER}" +KEYWORDS="~alpha ~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="doc int64 mpi static-libs tools threads" + +DEPEND=" + sys-libs/zlib + mpi? ( virtual/mpi )" +RDEPEND="${DEPEND}" + +S=${WORKDIR}/${P/-/_} + +static_to_shared() { + local libstatic=${1}; shift + local libname=$(basename ${libstatic%.a}) + local soname=${libname}$(get_libname ${SOVER}) + local libdir=$(dirname ${libstatic}) + + einfo "Making ${soname} from ${libstatic}" + if [[ ${CHOST} == *-darwin* ]] ; then + ${LINK:-$(tc-getCC)} ${LDFLAGS} \ + -dynamiclib -install_name "${EPREFIX}"/usr/lib/"${soname}" \ + -Wl,-all_load -Wl,${libstatic} \ + "$@" -o ${libdir}/${soname} || die "${soname} failed" + else + ${LINK:-$(tc-getCC)} ${LDFLAGS} \ + -shared -Wl,-soname=${soname} \ + -Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive \ + "$@" -o ${libdir}/${soname} || die "${soname} failed" + [[ $(get_version_component_count) -gt 1 ]] && \ + ln -s ${soname} ${libdir}/${libname}$(get_libname $(get_major_version)) + ln -s ${soname} ${libdir}/${libname}$(get_libname) + fi +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-as-needed.patch + epatch "${FILESDIR}"/${P}-flex-2.6.3-fix.patch + use int64 && append-cflags -DIDXSIZE64 + if use threads; then + append-cflags "-DSCOTCH_PTHREAD_NUMBER=$(nproc)" + else + append-cflags "-DSCOTCH_PTHREAD_NUMBER=1" + sed -i \ + -e 's/ -DSCOTCH_PTHREAD//' \ + src/Make.inc/Makefile.inc.i686_pc_linux3 || die + fi + sed -e "s/gcc/$(tc-getCC)/" \ + -e "s/-O3/${CFLAGS} -pthread/" \ + -e "s/ ar/ $(tc-getAR)/" \ + -e "s/ranlib/$(tc-getRANLIB)/" \ + -e "s/LDFLAGS/LIBS/" \ + src/Make.inc/Makefile.inc.i686_pc_linux3 > src/Makefile.inc || die +} + +src_compile() { + emake -C src CLIBFLAGS=-fPIC scotch esmumps + static_to_shared lib/libscotcherr.a + static_to_shared lib/libscotcherrexit.a + static_to_shared lib/libscotch.a -Llib -lz -lm -lrt -lpthread -lscotcherr + static_to_shared lib/libesmumps.a -Llib -lscotch + static_to_shared lib/libscotchmetis.a -Llib -lscotch + + if use mpi; then + emake -C src CLIBFLAGS=-fPIC ptscotch ptesmumps + export LINK=mpicc + static_to_shared lib/libptscotcherr.a + static_to_shared lib/libptscotcherrexit.a + static_to_shared lib/libptscotch.a -Llib -lscotch -lptscotcherr -lz -lm -lrt + static_to_shared lib/libptesmumps.a -Llib -lscotch -lptscotch + static_to_shared lib/libptscotchparmetis.a -Llib -lscotch -lptscotch + fi + if use static-libs; then + emake -C src clean + emake -C src + use mpi && emake -C src ptscotch + fi +} + +src_test() { + LD_LIBRARY_PATH="${S}/lib" emake -C src check +} + +src_install() { + dolib.so lib/lib*$(get_libname)* + use static-libs && dolib.a lib/*.a + + #install metis headers into a subdir + #to allow usage of real metis and scotch + #in the same code + insinto /usr/include/scotch/metis + doins include/*metis* + rm include/*metis* + insinto /usr/include/scotch + doins include/* + + cat <<-EOF > scotchmetis.pc + prefix=${EPREFIX}/usr + libdir=\${prefix}/$(get_libdir) + includedir=\${prefix}/include + Name: scotchmetis + Description: ${DESCRIPTION} + Version: ${PV} + URL: ${HOMEPAGE} + Libs: -L\${libdir} -lscotchmetis -lscotcherr -lscotch + Private: -lm -lz -lrt + Cflags: -I\${includedir}/scotch/metis + EOF + insinto /usr/$(get_libdir)/pkgconfig + doins scotchmetis.pc + + # not sure it is actually a full replacement of metis + #alternatives_for metis scotch 0 \ + # /usr/$(get_libdir)/pkgconfig/metis.pc scotchmetis.pc + + if use mpi; then + cat <<-EOF > ptscotchparmetis.pc + prefix=${EPREFIX}/usr + libdir=\${prefix}/$(get_libdir) + includedir=\${prefix}/include + Name: ptscotchparmetis + Description: ${DESCRIPTION} + Version: ${PV} + URL: ${HOMEPAGE} + Libs: -L\${libdir} -lptscotchparmetis -lptscotcherr -lptscotch + Private: -lm -lz -lrt + Cflags: -I\${includedir}/scotch/metis + Requires: scotchmetis + EOF + insinto /usr/$(get_libdir)/pkgconfig + doins ptscotchparmetis.pc + # not sure it is actually a full replacement of parmetis + #alternatives_for metis-mpi ptscotch 0 \ + # /usr/$(get_libdir)/pkgconfig/metis-mpi.pc ptscotchparmetis.pc + fi + + dodoc README.txt + + if use tools; then + local b m + pushd bin > /dev/null + for b in *; do + newbin ${b} scotch_${b} + done + popd > /dev/null + + pushd man/man1 > /dev/null + for m in *; do + newman ${m} scotch_${m} + done + popd > /dev/null + fi + + use doc && dodoc doc/*.pdf +}
