From ecf9d3ecc32b0d0048c8c98b329587970267f196 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Tue, 30 Aug 2016 17:46:08 +0200 Subject: [PATCH 01/30] Add license --- LICENSE | 265 ++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 238 insertions(+), 27 deletions(-) diff --git a/LICENSE b/LICENSE index 1b05c44307217..dbdfc89b0f692 100644 --- a/LICENSE +++ b/LICENSE @@ -1,28 +1,239 @@ -Copyright (c) 2015, conda-forge -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -* Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -* Neither the name of staged-recipes nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +CeCILL-C FREE SOFTWARE LICENSE AGREEMENT +Notice + +This Agreement is a Free Software license agreement that is the result of discussions between its authors in order to ensure compliance with the two main principles guiding its drafting: + +firstly, compliance with the principles governing the distribution of Free Software: access to source code, broad rights granted to users, +secondly, the election of a governing law, French law, with which it is conformant, both as regards the law of torts and intellectual property law, and the protection that it offers to both authors and holders of the economic rights over software. +The authors of the CeCILL-C1 license are: + +Commissariat à l'Energie Atomique - CEA, a public scientific, technical and industrial research establishment, having its principal place of business at 25 rue Leblanc, immeuble Le Ponant D, 75015 Paris, France. + +Centre National de la Recherche Scientifique - CNRS, a public scientific and technological establishment, having its principal place of business at 3 rue Michel-Ange, 75794 Paris cedex 16, France. + +Institut National de Recherche en Informatique et en Automatique - INRIA, a public scientific and technological establishment, having its principal place of business at Domaine de Voluceau, Rocquencourt, BP 105, 78153 Le Chesnay cedex, France. + +Preamble + +The purpose of this Free Software license agreement is to grant users the right to modify and re-use the software governed by this license. + +The exercising of this right is conditional upon the obligation to make available to the community the modifications made to the source code of the software so as to contribute to its evolution. + +In consideration of access to the source code and the rights to copy, modify and redistribute granted by the license, users are provided only with a limited warranty and the software's author, the holder of the economic rights, and the successive licensors only have limited liability. + +In this respect, the risks associated with loading, using, modifying and/or developing or reproducing the software by the user are brought to the user's attention, given its Free Software status, which may make it complicated to use, with the result that its use is reserved for developers and experienced professionals having in-depth computer knowledge. Users are therefore encouraged to load and test the suitability of the software as regards their requirements in conditions enabling the security of their systems and/or data to be ensured and, more generally, to use and operate it in the same conditions of security. This Agreement may be freely reproduced and published, provided it is not altered, and that no provisions are either added or removed herefrom. + +This Agreement may apply to any or all software for which the holder of the economic rights decides to submit the use thereof to its provisions. + +Article 1 - DEFINITIONS + +For the purpose of this Agreement, when the following expressions commence with a capital letter, they shall have the following meaning: + +Agreement: means this license agreement, and its possible subsequent versions and annexes. + +Software: means the software in its Object Code and/or Source Code form and, where applicable, its documentation, "as is" when the Licensee accepts the Agreement. + +Initial Software: means the Software in its Source Code and possibly its Object Code form and, where applicable, its documentation, "as is" when it is first distributed under the terms and conditions of the Agreement. + +Modified Software: means the Software modified by at least one Integrated Contribution. + +Source Code: means all the Software's instructions and program lines to which access is required so as to modify the Software. + +Object Code: means the binary files originating from the compilation of the Source Code. + +Holder: means the holder(s) of the economic rights over the Initial Software. + +Licensee: means the Software user(s) having accepted the Agreement. + +Contributor: means a Licensee having made at least one Integrated Contribution. + +Licensor: means the Holder, or any other individual or legal entity, who distributes the Software under the Agreement. + +Integrated Contribution: means any or all modifications, corrections, translations, adaptations and/or new functions integrated into the Source Code by any or all Contributors. + +Related Module: means a set of sources files including their documentation that, without modification to the Source Code, enables supplementary functions or services in addition to those offered by the Software. + +Derivative Software: means any combination of the Software, modified or not, and of a Related Module. + +Parties: mean both the Licensee and the Licensor. + +These expressions may be used both in singular and plural form. + +Article 2 - PURPOSE + +The purpose of the Agreement is the grant by the Licensor to the Licensee of a non-exclusive, transferable and worldwide license for the Software as set forth in Article 5 hereinafter for the whole term of the protection granted by the rights over said Software. + +Article 3 - ACCEPTANCE + +3.1 The Licensee shall be deemed as having accepted the terms and conditions of this Agreement upon the occurrence of the first of the following events: + +(i) loading the Software by any or all means, notably, by downloading from a remote server, or by loading from a physical medium; +(ii) the first time the Licensee exercises any of the rights granted hereunder. +3.2 One copy of the Agreement, containing a notice relating to the characteristics of the Software, to the limited warranty, and to the fact that its use is restricted to experienced users has been provided to the Licensee prior to its acceptance as set forth in Article 3.1 hereinabove, and the Licensee hereby acknowledges that it has read and understood it. + +Article 4 - EFFECTIVE DATE AND TERM + +4.1 EFFECTIVE DATE + +The Agreement shall become effective on the date when it is accepted by the Licensee as set forth in Article 3.1. + +4.2 TERM + +The Agreement shall remain in force for the entire legal term of protection of the economic rights over the Software. + +Article 5 - SCOPE OF RIGHTS GRANTED + +The Licensor hereby grants to the Licensee, who accepts, the following rights over the Software for any or all use, and for the term of the Agreement, on the basis of the terms and conditions set forth hereinafter. + +Besides, if the Licensor owns or comes to own one or more patents protecting all or part of the functions of the Software or of its components, the Licensor undertakes not to enforce the rights granted by these patents against successive Licensees using, exploiting or modifying the Software. If these patents are transferred, the Licensor undertakes to have the transferees subscribe to the obligations set forth in this paragraph. + +5.1 RIGHT OF USE + +The Licensee is authorized to use the Software, without any limitation as to its fields of application, with it being hereinafter specified that this comprises: + +permanent or temporary reproduction of all or part of the Software by any or all means and in any or all form. + +loading, displaying, running, or storing the Software on any or all medium. + +entitlement to observe, study or test its operation so as to determine the ideas and principles behind any or all constituent elements of said Software. This shall apply when the Licensee carries out any or all loading, displaying, running, transmission or storage operation as regards the Software, that it is entitled to carry out hereunder. + +5.2 RIGHT OF MODIFICATION + +The right of modification includes the right to translate, adapt, arrange, or make any or all modifications to the Software, and the right to reproduce the resulting software. It includes, in particular, the right to create a Derivative Software. + +The Licensee is authorized to make any or all modification to the Software provided that it includes an explicit notice that it is the author of said modification and indicates the date of the creation thereof. + +5.3 RIGHT OF DISTRIBUTION + +In particular, the right of distribution includes the right to publish, transmit and communicate the Software to the general public on any or all medium, and by any or all means, and the right to market, either in consideration of a fee, or free of charge, one or more copies of the Software by any means. + +The Licensee is further authorized to distribute copies of the modified or unmodified Software to third parties according to the terms and conditions set forth hereinafter. + +5.3.1 DISTRIBUTION OF SOFTWARE WITHOUT MODIFICATION + +The Licensee is authorized to distribute true copies of the Software in Source Code or Object Code form, provided that said distribution complies with all the provisions of the Agreement and is accompanied by: + +a copy of the Agreement, + +a notice relating to the limitation of both the Licensor's warranty and liability as set forth in Articles 8 and 9, + +and that, in the event that only the Object Code of the Software is redistributed, the Licensee allows effective access to the full Source Code of the Software at a minimum during the entire period of its distribution of the Software, it being understood that the additional cost of acquiring the Source Code shall not exceed the cost of transferring the data. + +5.3.2 DISTRIBUTION OF MODIFIED SOFTWARE + +When the Licensee makes an Integrated Contribution to the Software, the terms and conditions for the distribution of the resulting Modified Software become subject to all the provisions of this Agreement. + +The Licensee is authorized to distribute the Modified Software, in source code or object code form, provided that said distribution complies with all the provisions of the Agreement and is accompanied by: + +a copy of the Agreement, + +a notice relating to the limitation of both the Licensor's warranty and liability as set forth in Articles 8 and 9, + +and that, in the event that only the object code of the Modified Software is redistributed, the Licensee allows effective access to the full source code of the Modified Software at a minimum during the entire period of its distribution of the Modified Software, it being understood that the additional cost of acquiring the source code shall not exceed the cost of transferring the data. + +5.3.3 DISTRIBUTION OF DERIVATIVE SOFTWARE + +When the Licensee creates Derivative Software, this Derivative Software may be distributed under a license agreement other than this Agreement, subject to compliance with the requirement to include a notice concerning the rights over the Software as defined in Article 6.4. In the event the creation of the Derivative Software required modification of the Source Code, the Licensee undertakes that: + +the resulting Modified Software will be governed by this Agreement, +the Integrated Contributions in the resulting Modified Software will be clearly identified and documented, +the Licensee will allow effective access to the source code of the Modified Software, at a minimum during the entire period of distribution of the Derivative Software, such that such modifications may be carried over in a subsequent version of the Software; it being understood that the additional cost of purchasing the source code of the Modified Software shall not exceed the cost of transferring the data. +5.3.4 COMPATIBILITY WITH THE CeCILL LICENSE + +When a Modified Software contains an Integrated Contribution subject to the CeCILL license agreement, or when a Derivative Software contains a Related Module subject to the CeCILL license agreement, the provisions set forth in the third item of Article 6.4 are optional. + +Article 6 - INTELLECTUAL PROPERTY + +6.1 OVER THE INITIAL SOFTWARE + +The Holder owns the economic rights over the Initial Software. Any or all use of the Initial Software is subject to compliance with the terms and conditions under which the Holder has elected to distribute its work and no one shall be entitled to modify the terms and conditions for the distribution of said Initial Software. + +The Holder undertakes that the Initial Software will remain ruled at least by this Agreement, for the duration set forth in Article 4.2. + +6.2 OVER THE INTEGRATED CONTRIBUTIONS + +The Licensee who develops an Integrated Contribution is the owner of the intellectual property rights over this Contribution as defined by applicable law. + +6.3 OVER THE RELATED MODULES + +The Licensee who develops a Related Module is the owner of the intellectual property rights over this Related Module as defined by applicable law and is free to choose the type of agreement that shall govern its distribution under the conditions defined in Article 5.3.3. + +6.4 NOTICE OF RIGHTS + +The Licensee expressly undertakes: + +not to remove, or modify, in any manner, the intellectual property notices attached to the Software; + +to reproduce said notices, in an identical manner, in the copies of the Software modified or not; + +to ensure that use of the Software, its intellectual property notices and the fact that it is governed by the Agreement is indicated in a text that is easily accessible, specifically from the interface of any Derivative Software. +The Licensee undertakes not to directly or indirectly infringe the intellectual property rights of the Holder and/or Contributors on the Software and to take, where applicable, vis-à-vis its staff, any and all measures required to ensure respect of said intellectual property rights of the Holder and/or Contributors. + +Article 7 - RELATED SERVICES + +7.1 Under no circumstances shall the Agreement oblige the Licensor to provide technical assistance or maintenance services for the Software. + +However, the Licensor is entitled to offer this type of services. The terms and conditions of such technical assistance, and/or such maintenance, shall be set forth in a separate instrument. Only the Licensor offering said maintenance and/or technical assistance services shall incur liability therefor. + +7.2 Similarly, any Licensor is entitled to offer to its licensees, under its sole responsibility, a warranty, that shall only be binding upon itself, for the redistribution of the Software and/or the Modified Software, under terms and conditions that it is free to decide. Said warranty, and the financial terms and conditions of its application, shall be subject of a separate instrument executed between the Licensor and the Licensee. + +Article 8 - LIABILITY + +8.1 Subject to the provisions of Article 8.2, the Licensee shall be entitled to claim compensation for any direct loss it may have suffered from the Software as a result of a fault on the part of the relevant Licensor, subject to providing evidence thereof. + +8.2 The Licensor's liability is limited to the commitments made under this Agreement and shall not be incurred as a result of in particular: (i) loss due the Licensee's total or partial failure to fulfill its obligations, (ii) direct or consequential loss that is suffered by the Licensee due to the use or performance of the Software, and (iii) more generally, any consequential loss. In particular the Parties expressly agree that any or all pecuniary or business loss (i.e. loss of data, loss of profits, operating loss, loss of customers or orders, opportunity cost, any disturbance to business activities) or any or all legal proceedings instituted against the Licensee by a third party, shall constitute consequential loss and shall not provide entitlement to any or all compensation from the Licensor. + +Article 9 - WARRANTY + +9.1 The Licensee acknowledges that the scientific and technical state-of-the-art when the Software was distributed did not enable all possible uses to be tested and verified, nor for the presence of possible defects to be detected. In this respect, the Licensee's attention has been drawn to the risks associated with loading, using, modifying and/or developing and reproducing the Software which are reserved for experienced users. + +The Licensee shall be responsible for verifying, by any or all means, the suitability of the product for its requirements, its good working order, and for ensuring that it shall not cause damage to either persons or properties. + +9.2 The Licensor hereby represents, in good faith, that it is entitled to grant all the rights over the Software (including in particular the rights set forth in Article 5). + +9.3 The Licensee acknowledges that the Software is supplied "as is" by the Licensor without any other express or tacit warranty, other than that provided for in Article 9.2 and, in particular, without any warranty as to its commercial value, its secured, safe, innovative or relevant nature. + +Specifically, the Licensor does not warrant that the Software is free from any error, that it will operate without interruption, that it will be compatible with the Licensee's own equipment and software configuration, nor that it will meet the Licensee's requirements. + +9.4 The Licensor does not either expressly or tacitly warrant that the Software does not infringe any third party intellectual property right relating to a patent, software or any other property right. Therefore, the Licensor disclaims any and all liability towards the Licensee arising out of any or all proceedings for infringement that may be instituted in respect of the use, modification and redistribution of the Software. Nevertheless, should such proceedings be instituted against the Licensee, the Licensor shall provide it with technical and legal assistance for its defense. Such technical and legal assistance shall be decided on a case-by-case basis between the relevant Licensor and the Licensee pursuant to a memorandum of understanding. The Licensor disclaims any and all liability as regards the Licensee's use of the name of the Software. No warranty is given as regards the existence of prior rights over the name of the Software or as regards the existence of a trademark. + +Article 10 - TERMINATION + +10.1 In the event of a breach by the Licensee of its obligations hereunder, the Licensor may automatically terminate this Agreement thirty (30) days after notice has been sent to the Licensee and has remained ineffective. + +10.2 A Licensee whose Agreement is terminated shall no longer be authorized to use, modify or distribute the Software. However, any licenses that it may have granted prior to termination of the Agreement shall remain valid subject to their having been granted in compliance with the terms and conditions hereof. + +Article 11 - MISCELLANEOUS + +11.1 EXCUSABLE EVENTS + +Neither Party shall be liable for any or all delay, or failure to perform the Agreement, that may be attributable to an event of force majeure, an act of God or an outside cause, such as defective functioning or interruptions of the electricity or telecommunications networks, network paralysis following a virus attack, intervention by government authorities, natural disasters, water damage, earthquakes, fire, explosions, strikes and labor unrest, war, etc. + +11.2 Any failure by either Party, on one or more occasions, to invoke one or more of the provisions hereof, shall under no circumstances be interpreted as being a waiver by the interested Party of its right to invoke said provision(s) subsequently. + +11.3 The Agreement cancels and replaces any or all previous agreements, whether written or oral, between the Parties and having the same purpose, and constitutes the entirety of the agreement between said Parties concerning said purpose. No supplement or modification to the terms and conditions hereof shall be effective as between the Parties unless it is made in writing and signed by their duly authorized representatives. + +11.4 In the event that one or more of the provisions hereof were to conflict with a current or future applicable act or legislative text, said act or legislative text shall prevail, and the Parties shall make the necessary amendments so as to comply with said act or legislative text. All other provisions shall remain effective. Similarly, invalidity of a provision of the Agreement, for any reason whatsoever, shall not cause the Agreement as a whole to be invalid. + +11.5 LANGUAGE + +The Agreement is drafted in both French and English and both versions are deemed authentic. + +Article 12 - NEW VERSIONS OF THE AGREEMENT + +12.1 Any person is authorized to duplicate and distribute copies of this Agreement. + +12.2 So as to ensure coherence, the wording of this Agreement is protected and may only be modified by the authors of the License, who reserve the right to periodically publish updates or new versions of the Agreement, each with a separate number. These subsequent versions may address new issues encountered by Free Software. + +12.3 Any Software distributed under a given version of the Agreement may only be subsequently distributed under the same version of the Agreement or a subsequent version. + +Article 13 - GOVERNING LAW AND JURISDICTION + +13.1 The Agreement is governed by French law. The Parties agree to endeavor to seek an amicable solution to any disagreements or disputes that may arise during the performance of the Agreement. + +13.2 Failing an amicable solution within two (2) months as from their occurrence, and unless emergency proceedings are necessary, the disagreements or disputes shall be referred to the Paris Courts having jurisdiction, by the more diligent Party. + +1 CeCILL stands for Ce(a) C(nrs) I(nria) L(ogiciel) L(ibre) + +Version 1.0 dated 2006-09-05. \ No newline at end of file From 5ad5a14b1518253e24fa7f3c5e5684720a8b72bf Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Tue, 30 Aug 2016 17:46:49 +0200 Subject: [PATCH 02/30] Add build recipe --- recipes/scotch/build.sh | 25 +++++++++++++++++++ recipes/scotch/clock_gettime.patch | 18 ++++++++++++++ recipes/scotch/meta.yaml | 40 ++++++++++++++++++++++++++++++ 3 files changed, 83 insertions(+) create mode 100755 recipes/scotch/build.sh create mode 100755 recipes/scotch/clock_gettime.patch create mode 100755 recipes/scotch/meta.yaml diff --git a/recipes/scotch/build.sh b/recipes/scotch/build.sh new file mode 100755 index 0000000000000..a1af47d54dac5 --- /dev/null +++ b/recipes/scotch/build.sh @@ -0,0 +1,25 @@ +#!/bin/sh + +cd src/ +echo 'prefix = $PREFIX' > Makefile.inc +echo '' >> Makefile.inc +if [ `uname` == "Darwin" ]; then + cp Make.inc/Makefile.inc.i686_mac_darwin10 Makefile.inc + sed -i '' 's/-DSCOTCH_PTHREAD//g' Makefile.inc + sed -i '' 's/-O3/-O3 -fPIC/g' Makefile.inc +else + cp Make.inc/Makefile.inc.x86-64_pc_linux2 Makefile.inc + sed -i "s@CFLAGS\t\t=@CFLAGS\t= -I${PREFIX}/include@" Makefile.inc + sed -i "s@CLIBFLAGS\t=@CLIBFLAGS\t= -fPIC@g" Makefile.inc + sed -i 's#-l$(SCOTCHLIB)errexit#-l$(SCOTCHLIB)errexit -lm#g' esmumps/Makefile +fi +make esmumps | tee make.log 2>&1 +cd .. + +# install. +mkdir -p $PREFIX/lib/ +cp lib/* $PREFIX/lib/ +mkdir -p $PREFIX/bin/ +cp bin/* $PREFIX/bin/ +mkdir -p $PREFIX/include/ +cp include/* $PREFIX/include/ diff --git a/recipes/scotch/clock_gettime.patch b/recipes/scotch/clock_gettime.patch new file mode 100755 index 0000000000000..6512c25fd75c6 --- /dev/null +++ b/recipes/scotch/clock_gettime.patch @@ -0,0 +1,18 @@ +--- src/libscotch/common.c (revision 22563) ++++ src/libscotch/common.c (working copy) +@@ -104,7 +104,14 @@ + #else /* COMMON_TIMING_OLD */ + struct timespec tp; + +- clock_gettime (CLOCK_REALTIME, &tp); /* Elapsed time */ ++#if defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0 ++ clock_gettime(CLOCK_REALTIME, &tp); ++#else ++ struct timeval tv; ++ gettimeofday(&tv, NULL); ++ tp.tv_sec = tv.tv_sec; ++ tp.tv_nsec = tv.tv_usec * 1000; ++#endif + + return ((double) tp.tv_sec + (double) tp.tv_nsec * 1.0e-9L); + #endif /* COMMON_TIMING_OLD */ diff --git a/recipes/scotch/meta.yaml b/recipes/scotch/meta.yaml new file mode 100755 index 0000000000000..c73b01830f416 --- /dev/null +++ b/recipes/scotch/meta.yaml @@ -0,0 +1,40 @@ +package: + name: scotch + version: 6.0.4 + +source: + fn: scotch_6.0.4.tar.gz + md5: d58b825eb95e1db77efe8c6ff42d329f + url: http://gforge.inria.fr/frs/download.php/file/34618/scotch_6.0.4.tar.gz + patches: + - clock_gettime.patch [osx] + +build: + skip: true [win] + number: 0 + +requirements: + build: + - gcc + - zlib [linux] + run: + - zlib [linux] + - libgcc + +about: + home: https://www.labri.fr/perso/pelegrin/scotch/ + license: CeCILL-C + license_file: LICENSE + summary: 'SCOTCH: Static Mapping, Graph, Mesh and Hypergraph Partitioning, and Parallel and Sequential Sparse Matrix Ordering Package' + description: | + Software package and libraries for sequential and parallel + graph partitioning, static mapping and clustering, sequential + mesh and hypergraph partitioning, and sequential and parallel + sparse matrix block ordering. + doc_url: http://gforge.inria.fr/docman/?group_id=248 + +extra: + recipe-maintainers: + - basnijholt + + From 4e3dc89e813eea1bae13ba31dffd6ba07e02efd0 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Tue, 30 Aug 2016 17:53:47 +0200 Subject: [PATCH 03/30] Edit [win] selector --- recipes/scotch/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/scotch/meta.yaml b/recipes/scotch/meta.yaml index c73b01830f416..88fada69bf488 100755 --- a/recipes/scotch/meta.yaml +++ b/recipes/scotch/meta.yaml @@ -10,7 +10,7 @@ source: - clock_gettime.patch [osx] build: - skip: true [win] + skip: true # [win] number: 0 requirements: From 3cf9e8aefa92a349435f61f1b0afa29d16111273 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Tue, 30 Aug 2016 17:58:17 +0200 Subject: [PATCH 04/30] Correct name of LICENSE --- recipes/scotch/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/scotch/meta.yaml b/recipes/scotch/meta.yaml index 88fada69bf488..35b0032003366 100755 --- a/recipes/scotch/meta.yaml +++ b/recipes/scotch/meta.yaml @@ -24,7 +24,7 @@ requirements: about: home: https://www.labri.fr/perso/pelegrin/scotch/ license: CeCILL-C - license_file: LICENSE + license_file: LICENSE_en.txt summary: 'SCOTCH: Static Mapping, Graph, Mesh and Hypergraph Partitioning, and Parallel and Sequential Sparse Matrix Ordering Package' description: | Software package and libraries for sequential and parallel From 74a83b63cb6043cbb360951a6642e17c79f16ee9 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Tue, 30 Aug 2016 17:59:55 +0200 Subject: [PATCH 05/30] Correct selectors of [linux] --- recipes/scotch/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/scotch/meta.yaml b/recipes/scotch/meta.yaml index 35b0032003366..d1953b669e985 100755 --- a/recipes/scotch/meta.yaml +++ b/recipes/scotch/meta.yaml @@ -16,9 +16,9 @@ build: requirements: build: - gcc - - zlib [linux] + - zlib # [linux] run: - - zlib [linux] + - zlib # [linux] - libgcc about: From 8e2bbb88bbb27393b251be956a2d9cb1e8950eb2 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Tue, 30 Aug 2016 18:12:34 +0200 Subject: [PATCH 06/30] Add Jinja templates --- recipes/scotch/meta.yaml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/recipes/scotch/meta.yaml b/recipes/scotch/meta.yaml index d1953b669e985..6192ba2ee1e76 100755 --- a/recipes/scotch/meta.yaml +++ b/recipes/scotch/meta.yaml @@ -1,11 +1,16 @@ +{% set name = "scotch" %} +{% set version = "6.0.4" %} +{% set md5 = "d58439c548433adcda98e695be53e526ba940a4b9c44fb9a05d92cd495cdd47f" %} +{% set file_url = "http://gforge.inria.fr/frs/download.php/file/34618/scotch_6.0.4.tar.gz" %} + package: - name: scotch - version: 6.0.4 + name: {{ name|lower }} + version: {{ version }} source: - fn: scotch_6.0.4.tar.gz - md5: d58b825eb95e1db77efe8c6ff42d329f - url: http://gforge.inria.fr/frs/download.php/file/34618/scotch_6.0.4.tar.gz + fn: scotch_{{ version }}.tar.gz + md5: {{ md5 }} + url: {{ file_url }} patches: - clock_gettime.patch [osx] From a72d719ea5cc0d819dd9b7f9b1c0c0642a391b3c Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Tue, 30 Aug 2016 18:18:55 +0200 Subject: [PATCH 07/30] Correct md5 --- recipes/scotch/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/scotch/meta.yaml b/recipes/scotch/meta.yaml index 6192ba2ee1e76..fc373d785c468 100755 --- a/recipes/scotch/meta.yaml +++ b/recipes/scotch/meta.yaml @@ -1,6 +1,6 @@ {% set name = "scotch" %} {% set version = "6.0.4" %} -{% set md5 = "d58439c548433adcda98e695be53e526ba940a4b9c44fb9a05d92cd495cdd47f" %} +{% set md5 = "d58b825eb95e1db77efe8c6ff42d329f" %} {% set file_url = "http://gforge.inria.fr/frs/download.php/file/34618/scotch_6.0.4.tar.gz" %} package: From f5ea92be2800a136c32048ecbd565bdf3af6d5a1 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Tue, 30 Aug 2016 18:21:05 +0200 Subject: [PATCH 08/30] Correct [osx] selector --- recipes/scotch/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/scotch/meta.yaml b/recipes/scotch/meta.yaml index fc373d785c468..af036849f582c 100755 --- a/recipes/scotch/meta.yaml +++ b/recipes/scotch/meta.yaml @@ -12,7 +12,7 @@ source: md5: {{ md5 }} url: {{ file_url }} patches: - - clock_gettime.patch [osx] + - clock_gettime.patch # [osx] build: skip: true # [win] From 440d5a56feebb3ca25d75f25fb552c92b429aa29 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Tue, 30 Aug 2016 18:32:42 +0200 Subject: [PATCH 09/30] Add test section --- recipes/scotch/meta.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipes/scotch/meta.yaml b/recipes/scotch/meta.yaml index af036849f582c..e0c0a6001871b 100755 --- a/recipes/scotch/meta.yaml +++ b/recipes/scotch/meta.yaml @@ -26,6 +26,10 @@ requirements: - zlib # [linux] - libgcc +test: + commands: + - test # [osx] + about: home: https://www.labri.fr/perso/pelegrin/scotch/ license: CeCILL-C From 2962671f043cb0b1953f07eb8fba4a527d224839 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Tue, 30 Aug 2016 19:54:54 +0200 Subject: [PATCH 10/30] Suggestions jakirkham --- LICENSE | 265 ++++----------------------------------- recipes/scotch/build.sh | 1 + recipes/scotch/meta.yaml | 9 +- 3 files changed, 31 insertions(+), 244 deletions(-) diff --git a/LICENSE b/LICENSE index dbdfc89b0f692..1b05c44307217 100644 --- a/LICENSE +++ b/LICENSE @@ -1,239 +1,28 @@ -CeCILL-C FREE SOFTWARE LICENSE AGREEMENT +Copyright (c) 2015, conda-forge +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +* Neither the name of staged-recipes nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Notice - -This Agreement is a Free Software license agreement that is the result of discussions between its authors in order to ensure compliance with the two main principles guiding its drafting: - -firstly, compliance with the principles governing the distribution of Free Software: access to source code, broad rights granted to users, -secondly, the election of a governing law, French law, with which it is conformant, both as regards the law of torts and intellectual property law, and the protection that it offers to both authors and holders of the economic rights over software. -The authors of the CeCILL-C1 license are: - -Commissariat à l'Energie Atomique - CEA, a public scientific, technical and industrial research establishment, having its principal place of business at 25 rue Leblanc, immeuble Le Ponant D, 75015 Paris, France. - -Centre National de la Recherche Scientifique - CNRS, a public scientific and technological establishment, having its principal place of business at 3 rue Michel-Ange, 75794 Paris cedex 16, France. - -Institut National de Recherche en Informatique et en Automatique - INRIA, a public scientific and technological establishment, having its principal place of business at Domaine de Voluceau, Rocquencourt, BP 105, 78153 Le Chesnay cedex, France. - -Preamble - -The purpose of this Free Software license agreement is to grant users the right to modify and re-use the software governed by this license. - -The exercising of this right is conditional upon the obligation to make available to the community the modifications made to the source code of the software so as to contribute to its evolution. - -In consideration of access to the source code and the rights to copy, modify and redistribute granted by the license, users are provided only with a limited warranty and the software's author, the holder of the economic rights, and the successive licensors only have limited liability. - -In this respect, the risks associated with loading, using, modifying and/or developing or reproducing the software by the user are brought to the user's attention, given its Free Software status, which may make it complicated to use, with the result that its use is reserved for developers and experienced professionals having in-depth computer knowledge. Users are therefore encouraged to load and test the suitability of the software as regards their requirements in conditions enabling the security of their systems and/or data to be ensured and, more generally, to use and operate it in the same conditions of security. This Agreement may be freely reproduced and published, provided it is not altered, and that no provisions are either added or removed herefrom. - -This Agreement may apply to any or all software for which the holder of the economic rights decides to submit the use thereof to its provisions. - -Article 1 - DEFINITIONS - -For the purpose of this Agreement, when the following expressions commence with a capital letter, they shall have the following meaning: - -Agreement: means this license agreement, and its possible subsequent versions and annexes. - -Software: means the software in its Object Code and/or Source Code form and, where applicable, its documentation, "as is" when the Licensee accepts the Agreement. - -Initial Software: means the Software in its Source Code and possibly its Object Code form and, where applicable, its documentation, "as is" when it is first distributed under the terms and conditions of the Agreement. - -Modified Software: means the Software modified by at least one Integrated Contribution. - -Source Code: means all the Software's instructions and program lines to which access is required so as to modify the Software. - -Object Code: means the binary files originating from the compilation of the Source Code. - -Holder: means the holder(s) of the economic rights over the Initial Software. - -Licensee: means the Software user(s) having accepted the Agreement. - -Contributor: means a Licensee having made at least one Integrated Contribution. - -Licensor: means the Holder, or any other individual or legal entity, who distributes the Software under the Agreement. - -Integrated Contribution: means any or all modifications, corrections, translations, adaptations and/or new functions integrated into the Source Code by any or all Contributors. - -Related Module: means a set of sources files including their documentation that, without modification to the Source Code, enables supplementary functions or services in addition to those offered by the Software. - -Derivative Software: means any combination of the Software, modified or not, and of a Related Module. - -Parties: mean both the Licensee and the Licensor. - -These expressions may be used both in singular and plural form. - -Article 2 - PURPOSE - -The purpose of the Agreement is the grant by the Licensor to the Licensee of a non-exclusive, transferable and worldwide license for the Software as set forth in Article 5 hereinafter for the whole term of the protection granted by the rights over said Software. - -Article 3 - ACCEPTANCE - -3.1 The Licensee shall be deemed as having accepted the terms and conditions of this Agreement upon the occurrence of the first of the following events: - -(i) loading the Software by any or all means, notably, by downloading from a remote server, or by loading from a physical medium; -(ii) the first time the Licensee exercises any of the rights granted hereunder. -3.2 One copy of the Agreement, containing a notice relating to the characteristics of the Software, to the limited warranty, and to the fact that its use is restricted to experienced users has been provided to the Licensee prior to its acceptance as set forth in Article 3.1 hereinabove, and the Licensee hereby acknowledges that it has read and understood it. - -Article 4 - EFFECTIVE DATE AND TERM - -4.1 EFFECTIVE DATE - -The Agreement shall become effective on the date when it is accepted by the Licensee as set forth in Article 3.1. - -4.2 TERM - -The Agreement shall remain in force for the entire legal term of protection of the economic rights over the Software. - -Article 5 - SCOPE OF RIGHTS GRANTED - -The Licensor hereby grants to the Licensee, who accepts, the following rights over the Software for any or all use, and for the term of the Agreement, on the basis of the terms and conditions set forth hereinafter. - -Besides, if the Licensor owns or comes to own one or more patents protecting all or part of the functions of the Software or of its components, the Licensor undertakes not to enforce the rights granted by these patents against successive Licensees using, exploiting or modifying the Software. If these patents are transferred, the Licensor undertakes to have the transferees subscribe to the obligations set forth in this paragraph. - -5.1 RIGHT OF USE - -The Licensee is authorized to use the Software, without any limitation as to its fields of application, with it being hereinafter specified that this comprises: - -permanent or temporary reproduction of all or part of the Software by any or all means and in any or all form. - -loading, displaying, running, or storing the Software on any or all medium. - -entitlement to observe, study or test its operation so as to determine the ideas and principles behind any or all constituent elements of said Software. This shall apply when the Licensee carries out any or all loading, displaying, running, transmission or storage operation as regards the Software, that it is entitled to carry out hereunder. - -5.2 RIGHT OF MODIFICATION - -The right of modification includes the right to translate, adapt, arrange, or make any or all modifications to the Software, and the right to reproduce the resulting software. It includes, in particular, the right to create a Derivative Software. - -The Licensee is authorized to make any or all modification to the Software provided that it includes an explicit notice that it is the author of said modification and indicates the date of the creation thereof. - -5.3 RIGHT OF DISTRIBUTION - -In particular, the right of distribution includes the right to publish, transmit and communicate the Software to the general public on any or all medium, and by any or all means, and the right to market, either in consideration of a fee, or free of charge, one or more copies of the Software by any means. - -The Licensee is further authorized to distribute copies of the modified or unmodified Software to third parties according to the terms and conditions set forth hereinafter. - -5.3.1 DISTRIBUTION OF SOFTWARE WITHOUT MODIFICATION - -The Licensee is authorized to distribute true copies of the Software in Source Code or Object Code form, provided that said distribution complies with all the provisions of the Agreement and is accompanied by: - -a copy of the Agreement, - -a notice relating to the limitation of both the Licensor's warranty and liability as set forth in Articles 8 and 9, - -and that, in the event that only the Object Code of the Software is redistributed, the Licensee allows effective access to the full Source Code of the Software at a minimum during the entire period of its distribution of the Software, it being understood that the additional cost of acquiring the Source Code shall not exceed the cost of transferring the data. - -5.3.2 DISTRIBUTION OF MODIFIED SOFTWARE - -When the Licensee makes an Integrated Contribution to the Software, the terms and conditions for the distribution of the resulting Modified Software become subject to all the provisions of this Agreement. - -The Licensee is authorized to distribute the Modified Software, in source code or object code form, provided that said distribution complies with all the provisions of the Agreement and is accompanied by: - -a copy of the Agreement, - -a notice relating to the limitation of both the Licensor's warranty and liability as set forth in Articles 8 and 9, - -and that, in the event that only the object code of the Modified Software is redistributed, the Licensee allows effective access to the full source code of the Modified Software at a minimum during the entire period of its distribution of the Modified Software, it being understood that the additional cost of acquiring the source code shall not exceed the cost of transferring the data. - -5.3.3 DISTRIBUTION OF DERIVATIVE SOFTWARE - -When the Licensee creates Derivative Software, this Derivative Software may be distributed under a license agreement other than this Agreement, subject to compliance with the requirement to include a notice concerning the rights over the Software as defined in Article 6.4. In the event the creation of the Derivative Software required modification of the Source Code, the Licensee undertakes that: - -the resulting Modified Software will be governed by this Agreement, -the Integrated Contributions in the resulting Modified Software will be clearly identified and documented, -the Licensee will allow effective access to the source code of the Modified Software, at a minimum during the entire period of distribution of the Derivative Software, such that such modifications may be carried over in a subsequent version of the Software; it being understood that the additional cost of purchasing the source code of the Modified Software shall not exceed the cost of transferring the data. -5.3.4 COMPATIBILITY WITH THE CeCILL LICENSE - -When a Modified Software contains an Integrated Contribution subject to the CeCILL license agreement, or when a Derivative Software contains a Related Module subject to the CeCILL license agreement, the provisions set forth in the third item of Article 6.4 are optional. - -Article 6 - INTELLECTUAL PROPERTY - -6.1 OVER THE INITIAL SOFTWARE - -The Holder owns the economic rights over the Initial Software. Any or all use of the Initial Software is subject to compliance with the terms and conditions under which the Holder has elected to distribute its work and no one shall be entitled to modify the terms and conditions for the distribution of said Initial Software. - -The Holder undertakes that the Initial Software will remain ruled at least by this Agreement, for the duration set forth in Article 4.2. - -6.2 OVER THE INTEGRATED CONTRIBUTIONS - -The Licensee who develops an Integrated Contribution is the owner of the intellectual property rights over this Contribution as defined by applicable law. - -6.3 OVER THE RELATED MODULES - -The Licensee who develops a Related Module is the owner of the intellectual property rights over this Related Module as defined by applicable law and is free to choose the type of agreement that shall govern its distribution under the conditions defined in Article 5.3.3. - -6.4 NOTICE OF RIGHTS - -The Licensee expressly undertakes: - -not to remove, or modify, in any manner, the intellectual property notices attached to the Software; - -to reproduce said notices, in an identical manner, in the copies of the Software modified or not; - -to ensure that use of the Software, its intellectual property notices and the fact that it is governed by the Agreement is indicated in a text that is easily accessible, specifically from the interface of any Derivative Software. -The Licensee undertakes not to directly or indirectly infringe the intellectual property rights of the Holder and/or Contributors on the Software and to take, where applicable, vis-à-vis its staff, any and all measures required to ensure respect of said intellectual property rights of the Holder and/or Contributors. - -Article 7 - RELATED SERVICES - -7.1 Under no circumstances shall the Agreement oblige the Licensor to provide technical assistance or maintenance services for the Software. - -However, the Licensor is entitled to offer this type of services. The terms and conditions of such technical assistance, and/or such maintenance, shall be set forth in a separate instrument. Only the Licensor offering said maintenance and/or technical assistance services shall incur liability therefor. - -7.2 Similarly, any Licensor is entitled to offer to its licensees, under its sole responsibility, a warranty, that shall only be binding upon itself, for the redistribution of the Software and/or the Modified Software, under terms and conditions that it is free to decide. Said warranty, and the financial terms and conditions of its application, shall be subject of a separate instrument executed between the Licensor and the Licensee. - -Article 8 - LIABILITY - -8.1 Subject to the provisions of Article 8.2, the Licensee shall be entitled to claim compensation for any direct loss it may have suffered from the Software as a result of a fault on the part of the relevant Licensor, subject to providing evidence thereof. - -8.2 The Licensor's liability is limited to the commitments made under this Agreement and shall not be incurred as a result of in particular: (i) loss due the Licensee's total or partial failure to fulfill its obligations, (ii) direct or consequential loss that is suffered by the Licensee due to the use or performance of the Software, and (iii) more generally, any consequential loss. In particular the Parties expressly agree that any or all pecuniary or business loss (i.e. loss of data, loss of profits, operating loss, loss of customers or orders, opportunity cost, any disturbance to business activities) or any or all legal proceedings instituted against the Licensee by a third party, shall constitute consequential loss and shall not provide entitlement to any or all compensation from the Licensor. - -Article 9 - WARRANTY - -9.1 The Licensee acknowledges that the scientific and technical state-of-the-art when the Software was distributed did not enable all possible uses to be tested and verified, nor for the presence of possible defects to be detected. In this respect, the Licensee's attention has been drawn to the risks associated with loading, using, modifying and/or developing and reproducing the Software which are reserved for experienced users. - -The Licensee shall be responsible for verifying, by any or all means, the suitability of the product for its requirements, its good working order, and for ensuring that it shall not cause damage to either persons or properties. - -9.2 The Licensor hereby represents, in good faith, that it is entitled to grant all the rights over the Software (including in particular the rights set forth in Article 5). - -9.3 The Licensee acknowledges that the Software is supplied "as is" by the Licensor without any other express or tacit warranty, other than that provided for in Article 9.2 and, in particular, without any warranty as to its commercial value, its secured, safe, innovative or relevant nature. - -Specifically, the Licensor does not warrant that the Software is free from any error, that it will operate without interruption, that it will be compatible with the Licensee's own equipment and software configuration, nor that it will meet the Licensee's requirements. - -9.4 The Licensor does not either expressly or tacitly warrant that the Software does not infringe any third party intellectual property right relating to a patent, software or any other property right. Therefore, the Licensor disclaims any and all liability towards the Licensee arising out of any or all proceedings for infringement that may be instituted in respect of the use, modification and redistribution of the Software. Nevertheless, should such proceedings be instituted against the Licensee, the Licensor shall provide it with technical and legal assistance for its defense. Such technical and legal assistance shall be decided on a case-by-case basis between the relevant Licensor and the Licensee pursuant to a memorandum of understanding. The Licensor disclaims any and all liability as regards the Licensee's use of the name of the Software. No warranty is given as regards the existence of prior rights over the name of the Software or as regards the existence of a trademark. - -Article 10 - TERMINATION - -10.1 In the event of a breach by the Licensee of its obligations hereunder, the Licensor may automatically terminate this Agreement thirty (30) days after notice has been sent to the Licensee and has remained ineffective. - -10.2 A Licensee whose Agreement is terminated shall no longer be authorized to use, modify or distribute the Software. However, any licenses that it may have granted prior to termination of the Agreement shall remain valid subject to their having been granted in compliance with the terms and conditions hereof. - -Article 11 - MISCELLANEOUS - -11.1 EXCUSABLE EVENTS - -Neither Party shall be liable for any or all delay, or failure to perform the Agreement, that may be attributable to an event of force majeure, an act of God or an outside cause, such as defective functioning or interruptions of the electricity or telecommunications networks, network paralysis following a virus attack, intervention by government authorities, natural disasters, water damage, earthquakes, fire, explosions, strikes and labor unrest, war, etc. - -11.2 Any failure by either Party, on one or more occasions, to invoke one or more of the provisions hereof, shall under no circumstances be interpreted as being a waiver by the interested Party of its right to invoke said provision(s) subsequently. - -11.3 The Agreement cancels and replaces any or all previous agreements, whether written or oral, between the Parties and having the same purpose, and constitutes the entirety of the agreement between said Parties concerning said purpose. No supplement or modification to the terms and conditions hereof shall be effective as between the Parties unless it is made in writing and signed by their duly authorized representatives. - -11.4 In the event that one or more of the provisions hereof were to conflict with a current or future applicable act or legislative text, said act or legislative text shall prevail, and the Parties shall make the necessary amendments so as to comply with said act or legislative text. All other provisions shall remain effective. Similarly, invalidity of a provision of the Agreement, for any reason whatsoever, shall not cause the Agreement as a whole to be invalid. - -11.5 LANGUAGE - -The Agreement is drafted in both French and English and both versions are deemed authentic. - -Article 12 - NEW VERSIONS OF THE AGREEMENT - -12.1 Any person is authorized to duplicate and distribute copies of this Agreement. - -12.2 So as to ensure coherence, the wording of this Agreement is protected and may only be modified by the authors of the License, who reserve the right to periodically publish updates or new versions of the Agreement, each with a separate number. These subsequent versions may address new issues encountered by Free Software. - -12.3 Any Software distributed under a given version of the Agreement may only be subsequently distributed under the same version of the Agreement or a subsequent version. - -Article 13 - GOVERNING LAW AND JURISDICTION - -13.1 The Agreement is governed by French law. The Parties agree to endeavor to seek an amicable solution to any disagreements or disputes that may arise during the performance of the Agreement. - -13.2 Failing an amicable solution within two (2) months as from their occurrence, and unless emergency proceedings are necessary, the disagreements or disputes shall be referred to the Paris Courts having jurisdiction, by the more diligent Party. - -1 CeCILL stands for Ce(a) C(nrs) I(nria) L(ogiciel) L(ibre) - -Version 1.0 dated 2006-09-05. \ No newline at end of file diff --git a/recipes/scotch/build.sh b/recipes/scotch/build.sh index a1af47d54dac5..2dba4006d8c29 100755 --- a/recipes/scotch/build.sh +++ b/recipes/scotch/build.sh @@ -14,6 +14,7 @@ else sed -i 's#-l$(SCOTCHLIB)errexit#-l$(SCOTCHLIB)errexit -lm#g' esmumps/Makefile fi make esmumps | tee make.log 2>&1 +make check cd .. # install. diff --git a/recipes/scotch/meta.yaml b/recipes/scotch/meta.yaml index e0c0a6001871b..b47685e9019a0 100755 --- a/recipes/scotch/meta.yaml +++ b/recipes/scotch/meta.yaml @@ -1,7 +1,6 @@ {% set name = "scotch" %} {% set version = "6.0.4" %} {% set md5 = "d58b825eb95e1db77efe8c6ff42d329f" %} -{% set file_url = "http://gforge.inria.fr/frs/download.php/file/34618/scotch_6.0.4.tar.gz" %} package: name: {{ name|lower }} @@ -10,7 +9,7 @@ package: source: fn: scotch_{{ version }}.tar.gz md5: {{ md5 }} - url: {{ file_url }} + url: http://gforge.inria.fr/frs/download.php/file/34618/scotch_6.0.4.tar.gz patches: - clock_gettime.patch # [osx] @@ -20,11 +19,11 @@ build: requirements: build: - - gcc + - toolchain - zlib # [linux] run: - zlib # [linux] - - libgcc + - libgcc test: commands: @@ -45,5 +44,3 @@ about: extra: recipe-maintainers: - basnijholt - - From afd326689ce4a3fd8cf8d18258b131e1b2ebc05f Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Tue, 30 Aug 2016 21:01:55 +0200 Subject: [PATCH 11/30] Remove libgcc --- recipes/scotch/meta.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipes/scotch/meta.yaml b/recipes/scotch/meta.yaml index b47685e9019a0..a0a41d7f538f9 100755 --- a/recipes/scotch/meta.yaml +++ b/recipes/scotch/meta.yaml @@ -20,10 +20,9 @@ build: requirements: build: - toolchain - - zlib # [linux] + - zlib 1.2.* # [linux] run: - - zlib # [linux] - - libgcc + - zlib 1.2.* # [linux] test: commands: From ce063095a799180025ae1a677161fbdf65714020 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Tue, 30 Aug 2016 21:14:15 +0200 Subject: [PATCH 12/30] toolchain -> gcc --- recipes/scotch/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/scotch/meta.yaml b/recipes/scotch/meta.yaml index a0a41d7f538f9..773ec02ef1d24 100755 --- a/recipes/scotch/meta.yaml +++ b/recipes/scotch/meta.yaml @@ -19,10 +19,11 @@ build: requirements: build: - - toolchain + - gcc - zlib 1.2.* # [linux] run: - zlib 1.2.* # [linux] + - libgcc test: commands: From 0bffdd03d0be6af8a44cc54c992652fcfd951e4e Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Wed, 31 Aug 2016 11:14:45 +0200 Subject: [PATCH 13/30] Remove sed, add -L/lib, add bison, flex, and toolchain, remove libgcc --- .../scotch/Makefile.inc.i686_mac_darwin10.inc | 21 +++++++++++++++++++ recipes/scotch/Makefile.inc.x86-64_pc_linux2 | 21 +++++++++++++++++++ recipes/scotch/build.sh | 12 ++++------- recipes/scotch/meta.yaml | 11 +++++----- 4 files changed, 52 insertions(+), 13 deletions(-) create mode 100644 recipes/scotch/Makefile.inc.i686_mac_darwin10.inc create mode 100644 recipes/scotch/Makefile.inc.x86-64_pc_linux2 diff --git a/recipes/scotch/Makefile.inc.i686_mac_darwin10.inc b/recipes/scotch/Makefile.inc.i686_mac_darwin10.inc new file mode 100644 index 0000000000000..b376d0f26021b --- /dev/null +++ b/recipes/scotch/Makefile.inc.i686_mac_darwin10.inc @@ -0,0 +1,21 @@ +EXE = +LIB = .a +OBJ = .o + +MAKE = make +AR = ar +ARFLAGS = -ruv +CAT = cat +CCS = gcc +CCP = mpicc +CCD = gcc +CFLAGS = -O3 -fPIC -Drestrict=__restrict -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_PTHREAD_BARRIER -DCOMMON_RANDOM_FIXED_SEED -DCOMMON_TIMING_OLD -DSCOTCH_RENAME +CLIBFLAGS = +LDFLAGS = -lz -lm -lpthread +CP = cp +LEX = flex -Pscotchyy -olex.yy.c +LN = ln +MKDIR = mkdir +MV = mv +RANLIB = ranlib +YACC = bison -pscotchyy -y -b y diff --git a/recipes/scotch/Makefile.inc.x86-64_pc_linux2 b/recipes/scotch/Makefile.inc.x86-64_pc_linux2 new file mode 100644 index 0000000000000..621bddc0691e2 --- /dev/null +++ b/recipes/scotch/Makefile.inc.x86-64_pc_linux2 @@ -0,0 +1,21 @@ +EXE = +LIB = .a +OBJ = .o + +MAKE = make +AR = ar +ARFLAGS = -ruv +CAT = cat +CCS = gcc +CCP = mpicc +CCD = gcc +CFLAGS = -I/include -O3 -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD -Drestrict=__restrict -DIDXSIZE64 +CLIBFLAGS = -fPIC +LDFLAGS = -lz -lm -lrt -pthread +CP = cp +LEX = flex -Pscotchyy -olex.yy.c +LN = ln +MKDIR = mkdir +MV = mv +RANLIB = ranlib +YACC = bison -pscotchyy -y -b y diff --git a/recipes/scotch/build.sh b/recipes/scotch/build.sh index 2dba4006d8c29..79d2c496d0653 100755 --- a/recipes/scotch/build.sh +++ b/recipes/scotch/build.sh @@ -1,18 +1,14 @@ #!/bin/sh cd src/ -echo 'prefix = $PREFIX' > Makefile.inc -echo '' >> Makefile.inc + if [ `uname` == "Darwin" ]; then - cp Make.inc/Makefile.inc.i686_mac_darwin10 Makefile.inc - sed -i '' 's/-DSCOTCH_PTHREAD//g' Makefile.inc - sed -i '' 's/-O3/-O3 -fPIC/g' Makefile.inc + cp $RECIPE_DIR/Makefile.inc.i686_mac_darwin10 Makefile.inc else - cp Make.inc/Makefile.inc.x86-64_pc_linux2 Makefile.inc - sed -i "s@CFLAGS\t\t=@CFLAGS\t= -I${PREFIX}/include@" Makefile.inc - sed -i "s@CLIBFLAGS\t=@CLIBFLAGS\t= -fPIC@g" Makefile.inc + cp $RECIPE_DIR/Makefile.inc.x86-64_pc_linux2 Makefile.inc sed -i 's#-l$(SCOTCHLIB)errexit#-l$(SCOTCHLIB)errexit -lm#g' esmumps/Makefile fi + make esmumps | tee make.log 2>&1 make check cd .. diff --git a/recipes/scotch/meta.yaml b/recipes/scotch/meta.yaml index 773ec02ef1d24..84735703297ea 100755 --- a/recipes/scotch/meta.yaml +++ b/recipes/scotch/meta.yaml @@ -7,7 +7,7 @@ package: version: {{ version }} source: - fn: scotch_{{ version }}.tar.gz + fn: scotch_6.0.4.tar.gz md5: {{ md5 }} url: http://gforge.inria.fr/frs/download.php/file/34618/scotch_6.0.4.tar.gz patches: @@ -19,11 +19,12 @@ build: requirements: build: - - gcc - - zlib 1.2.* # [linux] + - toolchain + - zlib 1.2.* # [unix] + - bison + - flex run: - - zlib 1.2.* # [linux] - - libgcc + - zlib 1.2.* # [unix] test: commands: From abcbff5eb3d4eb181c15b02ec2506736cd6298b6 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Wed, 31 Aug 2016 11:20:14 +0200 Subject: [PATCH 14/30] library search path --- recipes/scotch/Makefile.inc.x86-64_pc_linux2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/scotch/Makefile.inc.x86-64_pc_linux2 b/recipes/scotch/Makefile.inc.x86-64_pc_linux2 index 621bddc0691e2..0aa4682acdf4d 100644 --- a/recipes/scotch/Makefile.inc.x86-64_pc_linux2 +++ b/recipes/scotch/Makefile.inc.x86-64_pc_linux2 @@ -11,7 +11,7 @@ CCP = mpicc CCD = gcc CFLAGS = -I/include -O3 -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD -Drestrict=__restrict -DIDXSIZE64 CLIBFLAGS = -fPIC -LDFLAGS = -lz -lm -lrt -pthread +LDFLAGS = -L${PREFIX}/lib -lz -lm -lrt -pthread CP = cp LEX = flex -Pscotchyy -olex.yy.c LN = ln From 904a2b4528da724c4cd7f535c1ec8f0db96ccf09 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Wed, 31 Aug 2016 11:24:48 +0200 Subject: [PATCH 15/30] PREFIX in include path --- recipes/scotch/Makefile.inc.x86-64_pc_linux2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/scotch/Makefile.inc.x86-64_pc_linux2 b/recipes/scotch/Makefile.inc.x86-64_pc_linux2 index 0aa4682acdf4d..b52ab6d1338cb 100644 --- a/recipes/scotch/Makefile.inc.x86-64_pc_linux2 +++ b/recipes/scotch/Makefile.inc.x86-64_pc_linux2 @@ -9,7 +9,7 @@ CAT = cat CCS = gcc CCP = mpicc CCD = gcc -CFLAGS = -I/include -O3 -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD -Drestrict=__restrict -DIDXSIZE64 +CFLAGS = -I${PREFIX}/include -O3 -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD -Drestrict=__restrict -DIDXSIZE64 CLIBFLAGS = -fPIC LDFLAGS = -L${PREFIX}/lib -lz -lm -lrt -pthread CP = cp From 86bbec6bf9c151ac07a6350a8d745c144aed94b1 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Wed, 31 Aug 2016 11:29:25 +0200 Subject: [PATCH 16/30] Rename Makefile.inc.i686_mac_darwin10 --- ...e.inc.i686_mac_darwin10.inc => Makefile.inc.i686_mac_darwin10} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename recipes/scotch/{Makefile.inc.i686_mac_darwin10.inc => Makefile.inc.i686_mac_darwin10} (100%) diff --git a/recipes/scotch/Makefile.inc.i686_mac_darwin10.inc b/recipes/scotch/Makefile.inc.i686_mac_darwin10 similarity index 100% rename from recipes/scotch/Makefile.inc.i686_mac_darwin10.inc rename to recipes/scotch/Makefile.inc.i686_mac_darwin10 From 9470b2b2d124c79efd8e645c9b07cb8ffcc3da89 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Wed, 31 Aug 2016 11:30:58 +0200 Subject: [PATCH 17/30] Remove clock_gettime.patch --- recipes/scotch/clock_gettime.patch | 18 ------------------ recipes/scotch/meta.yaml | 2 -- 2 files changed, 20 deletions(-) delete mode 100755 recipes/scotch/clock_gettime.patch diff --git a/recipes/scotch/clock_gettime.patch b/recipes/scotch/clock_gettime.patch deleted file mode 100755 index 6512c25fd75c6..0000000000000 --- a/recipes/scotch/clock_gettime.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- src/libscotch/common.c (revision 22563) -+++ src/libscotch/common.c (working copy) -@@ -104,7 +104,14 @@ - #else /* COMMON_TIMING_OLD */ - struct timespec tp; - -- clock_gettime (CLOCK_REALTIME, &tp); /* Elapsed time */ -+#if defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0 -+ clock_gettime(CLOCK_REALTIME, &tp); -+#else -+ struct timeval tv; -+ gettimeofday(&tv, NULL); -+ tp.tv_sec = tv.tv_sec; -+ tp.tv_nsec = tv.tv_usec * 1000; -+#endif - - return ((double) tp.tv_sec + (double) tp.tv_nsec * 1.0e-9L); - #endif /* COMMON_TIMING_OLD */ diff --git a/recipes/scotch/meta.yaml b/recipes/scotch/meta.yaml index 84735703297ea..29c772c2f1c16 100755 --- a/recipes/scotch/meta.yaml +++ b/recipes/scotch/meta.yaml @@ -10,8 +10,6 @@ source: fn: scotch_6.0.4.tar.gz md5: {{ md5 }} url: http://gforge.inria.fr/frs/download.php/file/34618/scotch_6.0.4.tar.gz - patches: - - clock_gettime.patch # [osx] build: skip: true # [win] From ef9c12741d70a28c2cb8eeb724469f82bdf1a476 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Wed, 31 Aug 2016 11:35:35 +0200 Subject: [PATCH 18/30] Exclude test --- recipes/scotch/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/scotch/meta.yaml b/recipes/scotch/meta.yaml index 29c772c2f1c16..015ff12cdc2ce 100755 --- a/recipes/scotch/meta.yaml +++ b/recipes/scotch/meta.yaml @@ -26,7 +26,7 @@ requirements: test: commands: - - test # [osx] + - test # [win] about: home: https://www.labri.fr/perso/pelegrin/scotch/ From 31a58b4d878ea647807d3d571f6279c4f1fb3abf Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Wed, 31 Aug 2016 15:47:20 +0200 Subject: [PATCH 19/30] Add test for /lib/ files --- recipes/scotch/meta.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/recipes/scotch/meta.yaml b/recipes/scotch/meta.yaml index 015ff12cdc2ce..87a54cfab424d 100755 --- a/recipes/scotch/meta.yaml +++ b/recipes/scotch/meta.yaml @@ -26,7 +26,12 @@ requirements: test: commands: - - test # [win] + # Check for library. + - test -f "${PREFIX}/lib/libscotch.a" + - test -f "${PREFIX}/lib/libscotcherr.a" + - test -f "${PREFIX}/lib/libscotcherrexit.a" + - test -f "${PREFIX}/lib/libscotchmetis.a" + - test -f "${PREFIX}/lib/libesmumps.a" about: home: https://www.labri.fr/perso/pelegrin/scotch/ From 1c8e31689e83d3a16fd2f653cdcd7283c237eb58 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Sat, 24 Sep 2016 10:17:02 +0200 Subject: [PATCH 20/30] More jinja templating --- recipes/scotch/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/scotch/meta.yaml b/recipes/scotch/meta.yaml index 87a54cfab424d..5ffe1bb851577 100755 --- a/recipes/scotch/meta.yaml +++ b/recipes/scotch/meta.yaml @@ -7,9 +7,9 @@ package: version: {{ version }} source: - fn: scotch_6.0.4.tar.gz + fn: {{ name }}-{{ version }}.tar.gz md5: {{ md5 }} - url: http://gforge.inria.fr/frs/download.php/file/34618/scotch_6.0.4.tar.gz + url: http://gforge.inria.fr/frs/download.php/file/34618/{{ name }}-{{ version }}.tar.gz build: skip: true # [win] From 2c6496b69cd576285e6a31a4bf47c597e00e395b Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Sat, 24 Sep 2016 10:18:35 +0200 Subject: [PATCH 21/30] gcc -> clang --- recipes/scotch/Makefile.inc.i686_mac_darwin10 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/scotch/Makefile.inc.i686_mac_darwin10 b/recipes/scotch/Makefile.inc.i686_mac_darwin10 index b376d0f26021b..1d6dc70c8a497 100644 --- a/recipes/scotch/Makefile.inc.i686_mac_darwin10 +++ b/recipes/scotch/Makefile.inc.i686_mac_darwin10 @@ -6,9 +6,9 @@ MAKE = make AR = ar ARFLAGS = -ruv CAT = cat -CCS = gcc +CCS = clang CCP = mpicc -CCD = gcc +CCD = clang CFLAGS = -O3 -fPIC -Drestrict=__restrict -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_PTHREAD_BARRIER -DCOMMON_RANDOM_FIXED_SEED -DCOMMON_TIMING_OLD -DSCOTCH_RENAME CLIBFLAGS = LDFLAGS = -lz -lm -lpthread From 7d376d6b9e54aa52c0fdc065f3c8441fb8697f5e Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Sat, 24 Sep 2016 10:33:34 +0200 Subject: [PATCH 22/30] Test for installed header files --- recipes/scotch/meta.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipes/scotch/meta.yaml b/recipes/scotch/meta.yaml index 5ffe1bb851577..92a14e3aadabe 100755 --- a/recipes/scotch/meta.yaml +++ b/recipes/scotch/meta.yaml @@ -32,6 +32,10 @@ test: - test -f "${PREFIX}/lib/libscotcherrexit.a" - test -f "${PREFIX}/lib/libscotchmetis.a" - test -f "${PREFIX}/lib/libesmumps.a" + - test -f "${PREFIX}/include/esmumps.h" + - test -f "${PREFIX}/include/metis.h" + - test -f "${PREFIX}/include/scotch.h" + - test -f "${PREFIX}/include/scotchf.h" about: home: https://www.labri.fr/perso/pelegrin/scotch/ From 3b65579d9be454c51394fcad5d3f0bb8f1656dcd Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Mon, 26 Sep 2016 08:36:53 +0200 Subject: [PATCH 23/30] Template friendly url --- recipes/scotch/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/scotch/meta.yaml b/recipes/scotch/meta.yaml index 92a14e3aadabe..aa18c58a218ae 100755 --- a/recipes/scotch/meta.yaml +++ b/recipes/scotch/meta.yaml @@ -9,7 +9,7 @@ package: source: fn: {{ name }}-{{ version }}.tar.gz md5: {{ md5 }} - url: http://gforge.inria.fr/frs/download.php/file/34618/{{ name }}-{{ version }}.tar.gz + url: https://gforge.inria.fr/frs/download.php/latestfile/298/{{ name }}_{{ version }}.tar.gz build: skip: true # [win] From 5c36d65ee1878382cd68012271cc93e9234e3a28 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Mon, 26 Sep 2016 08:42:08 +0200 Subject: [PATCH 24/30] Add lib and include path in MacOS build file --- recipes/scotch/Makefile.inc.i686_mac_darwin10 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/scotch/Makefile.inc.i686_mac_darwin10 b/recipes/scotch/Makefile.inc.i686_mac_darwin10 index 1d6dc70c8a497..288025ca7729a 100644 --- a/recipes/scotch/Makefile.inc.i686_mac_darwin10 +++ b/recipes/scotch/Makefile.inc.i686_mac_darwin10 @@ -9,9 +9,9 @@ CAT = cat CCS = clang CCP = mpicc CCD = clang -CFLAGS = -O3 -fPIC -Drestrict=__restrict -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_PTHREAD_BARRIER -DCOMMON_RANDOM_FIXED_SEED -DCOMMON_TIMING_OLD -DSCOTCH_RENAME +CFLAGS = -I${PREFIX}/include -O3 -fPIC -Drestrict=__restrict -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_PTHREAD_BARRIER -DCOMMON_RANDOM_FIXED_SEED -DCOMMON_TIMING_OLD -DSCOTCH_RENAME CLIBFLAGS = -LDFLAGS = -lz -lm -lpthread +LDFLAGS = -L${PREFIX}/lib -lz -lm -lpthread CP = cp LEX = flex -Pscotchyy -olex.yy.c LN = ln From e92001eae5373cbbf7e322d0ec5e9612ca14b3c0 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Mon, 26 Sep 2016 08:48:07 +0200 Subject: [PATCH 25/30] Run executables in test --- recipes/scotch/meta.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/recipes/scotch/meta.yaml b/recipes/scotch/meta.yaml index aa18c58a218ae..7e9d67e39c98f 100755 --- a/recipes/scotch/meta.yaml +++ b/recipes/scotch/meta.yaml @@ -26,7 +26,6 @@ requirements: test: commands: - # Check for library. - test -f "${PREFIX}/lib/libscotch.a" - test -f "${PREFIX}/lib/libscotcherr.a" - test -f "${PREFIX}/lib/libscotcherrexit.a" @@ -36,6 +35,11 @@ test: - test -f "${PREFIX}/include/metis.h" - test -f "${PREFIX}/include/scotch.h" - test -f "${PREFIX}/include/scotchf.h" + - mord -V + - gotst -V + - gord -V + - gpart -V + - gmap -V about: home: https://www.labri.fr/perso/pelegrin/scotch/ From a4d5035b096091c6bcdb583dfee168417a843b8a Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Mon, 3 Oct 2016 13:23:27 +0200 Subject: [PATCH 26/30] conda-forge zlib for OSX --- recipes/scotch/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/scotch/meta.yaml b/recipes/scotch/meta.yaml index 7e9d67e39c98f..f8547756953c2 100755 --- a/recipes/scotch/meta.yaml +++ b/recipes/scotch/meta.yaml @@ -18,11 +18,11 @@ build: requirements: build: - toolchain - - zlib 1.2.* # [unix] + - zlib 1.2.* - bison - flex run: - - zlib 1.2.* # [unix] + - zlib 1.2.* test: commands: From d87384bda66e97590544281bb3016f08a52b030f Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Mon, 3 Oct 2016 14:54:48 +0200 Subject: [PATCH 27/30] shared libs --- recipes/scotch/Makefile.inc.i686_mac_darwin10 | 2 +- recipes/scotch/Makefile.inc.x86-64_pc_linux2 | 21 ------------------- .../Makefile.inc.x86-64_pc_linux2.shlib | 21 +++++++++++++++++++ recipes/scotch/build.sh | 2 +- 4 files changed, 23 insertions(+), 23 deletions(-) delete mode 100644 recipes/scotch/Makefile.inc.x86-64_pc_linux2 create mode 100644 recipes/scotch/Makefile.inc.x86-64_pc_linux2.shlib diff --git a/recipes/scotch/Makefile.inc.i686_mac_darwin10 b/recipes/scotch/Makefile.inc.i686_mac_darwin10 index 288025ca7729a..0ee2e8694940a 100644 --- a/recipes/scotch/Makefile.inc.i686_mac_darwin10 +++ b/recipes/scotch/Makefile.inc.i686_mac_darwin10 @@ -9,7 +9,7 @@ CAT = cat CCS = clang CCP = mpicc CCD = clang -CFLAGS = -I${PREFIX}/include -O3 -fPIC -Drestrict=__restrict -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_PTHREAD_BARRIER -DCOMMON_RANDOM_FIXED_SEED -DCOMMON_TIMING_OLD -DSCOTCH_RENAME +CFLAGS = -I${PREFIX}/include -O3 -Drestrict=__restrict -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_PTHREAD_BARRIER -DCOMMON_RANDOM_FIXED_SEED -DCOMMON_TIMING_OLD -DSCOTCH_PTHREAD -DSCOTCH_RENAME CLIBFLAGS = LDFLAGS = -L${PREFIX}/lib -lz -lm -lpthread CP = cp diff --git a/recipes/scotch/Makefile.inc.x86-64_pc_linux2 b/recipes/scotch/Makefile.inc.x86-64_pc_linux2 deleted file mode 100644 index b52ab6d1338cb..0000000000000 --- a/recipes/scotch/Makefile.inc.x86-64_pc_linux2 +++ /dev/null @@ -1,21 +0,0 @@ -EXE = -LIB = .a -OBJ = .o - -MAKE = make -AR = ar -ARFLAGS = -ruv -CAT = cat -CCS = gcc -CCP = mpicc -CCD = gcc -CFLAGS = -I${PREFIX}/include -O3 -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD -Drestrict=__restrict -DIDXSIZE64 -CLIBFLAGS = -fPIC -LDFLAGS = -L${PREFIX}/lib -lz -lm -lrt -pthread -CP = cp -LEX = flex -Pscotchyy -olex.yy.c -LN = ln -MKDIR = mkdir -MV = mv -RANLIB = ranlib -YACC = bison -pscotchyy -y -b y diff --git a/recipes/scotch/Makefile.inc.x86-64_pc_linux2.shlib b/recipes/scotch/Makefile.inc.x86-64_pc_linux2.shlib new file mode 100644 index 0000000000000..97769fbac263e --- /dev/null +++ b/recipes/scotch/Makefile.inc.x86-64_pc_linux2.shlib @@ -0,0 +1,21 @@ +EXE = +LIB = .so +OBJ = .o + +MAKE = make +AR = gcc +ARFLAGS = -shared -o +CAT = cat +CCS = gcc +CCP = mpicc +CCD = gcc +CFLAGS = -I${PREFIX}/include -O3 -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD -Drestrict=__restrict -DIDXSIZE64 +CLIBFLAGS = -shared -fPIC +LDFLAGS = -L${PREFIX}/lib -lz -lm -lrt -pthread +CP = cp +LEX = flex -Pscotchyy -olex.yy.c +LN = ln +MKDIR = mkdir +MV = mv +RANLIB = echo +YACC = bison -pscotchyy -y -b y diff --git a/recipes/scotch/build.sh b/recipes/scotch/build.sh index 79d2c496d0653..5ff1946289e69 100755 --- a/recipes/scotch/build.sh +++ b/recipes/scotch/build.sh @@ -5,7 +5,7 @@ cd src/ if [ `uname` == "Darwin" ]; then cp $RECIPE_DIR/Makefile.inc.i686_mac_darwin10 Makefile.inc else - cp $RECIPE_DIR/Makefile.inc.x86-64_pc_linux2 Makefile.inc + cp $RECIPE_DIR/Makefile.inc.x86-64_pc_linux2.shlib Makefile.inc sed -i 's#-l$(SCOTCHLIB)errexit#-l$(SCOTCHLIB)errexit -lm#g' esmumps/Makefile fi From 1423d7a69c04c0c97b8f5c068ec611eba502ab54 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Mon, 3 Oct 2016 17:16:48 +0200 Subject: [PATCH 28/30] Revert to non shared lib --- recipes/scotch/Makefile.inc.x86-64_pc_linux2 | 21 ++++++++++ .../Makefile.inc.x86-64_pc_linux2.shlib | 40 +++++++++---------- recipes/scotch/build.sh | 2 +- recipes/scotch/meta.yaml | 11 ++--- 4 files changed, 48 insertions(+), 26 deletions(-) create mode 100644 recipes/scotch/Makefile.inc.x86-64_pc_linux2 diff --git a/recipes/scotch/Makefile.inc.x86-64_pc_linux2 b/recipes/scotch/Makefile.inc.x86-64_pc_linux2 new file mode 100644 index 0000000000000..0ed81695c414f --- /dev/null +++ b/recipes/scotch/Makefile.inc.x86-64_pc_linux2 @@ -0,0 +1,21 @@ +-EXE = + -LIB = .a + -OBJ = .o + - + -MAKE = make + -AR = ar + -ARFLAGS = -ruv + -CAT = cat + -CCS = gcc + -CCP = mpicc + -CCD = gcc + -CFLAGS = -I${PREFIX}/include -O3 -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD -Drestrict=__restrict -DIDXSIZE64 + -CLIBFLAGS = -fPIC + -LDFLAGS = -L${PREFIX}/lib -lz -lm -lrt -pthread + -CP = cp + -LEX = flex -Pscotchyy -olex.yy.c + -LN = ln + -MKDIR = mkdir + -MV = mv + -RANLIB = ranlib + -YACC = bison -pscotchyy -y -b y \ No newline at end of file diff --git a/recipes/scotch/Makefile.inc.x86-64_pc_linux2.shlib b/recipes/scotch/Makefile.inc.x86-64_pc_linux2.shlib index 97769fbac263e..284bf917fd20d 100644 --- a/recipes/scotch/Makefile.inc.x86-64_pc_linux2.shlib +++ b/recipes/scotch/Makefile.inc.x86-64_pc_linux2.shlib @@ -1,21 +1,21 @@ -EXE = -LIB = .so -OBJ = .o +EXE = +LIB = .so +OBJ = .o -MAKE = make -AR = gcc -ARFLAGS = -shared -o -CAT = cat -CCS = gcc -CCP = mpicc -CCD = gcc -CFLAGS = -I${PREFIX}/include -O3 -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD -Drestrict=__restrict -DIDXSIZE64 -CLIBFLAGS = -shared -fPIC -LDFLAGS = -L${PREFIX}/lib -lz -lm -lrt -pthread -CP = cp -LEX = flex -Pscotchyy -olex.yy.c -LN = ln -MKDIR = mkdir -MV = mv -RANLIB = echo -YACC = bison -pscotchyy -y -b y +MAKE = make +AR = gcc +ARFLAGS = -shared -o +CAT = cat +CCS = gcc +CCP = mpicc +CCD = gcc +CFLAGS = -I${PREFIX}/include -O3 -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD -Drestrict=__restrict -DIDXSIZE64 +CLIBFLAGS = -shared -fPIC +LDFLAGS = -L${PREFIX}/lib -lz -lm -lrt -pthread +CP = cp +LEX = flex -Pscotchyy -olex.yy.c +LN = ln +MKDIR = mkdir +MV = mv +RANLIB = echo +YACC = bison -pscotchyy -y -b y \ No newline at end of file diff --git a/recipes/scotch/build.sh b/recipes/scotch/build.sh index 5ff1946289e69..79d2c496d0653 100755 --- a/recipes/scotch/build.sh +++ b/recipes/scotch/build.sh @@ -5,7 +5,7 @@ cd src/ if [ `uname` == "Darwin" ]; then cp $RECIPE_DIR/Makefile.inc.i686_mac_darwin10 Makefile.inc else - cp $RECIPE_DIR/Makefile.inc.x86-64_pc_linux2.shlib Makefile.inc + cp $RECIPE_DIR/Makefile.inc.x86-64_pc_linux2 Makefile.inc sed -i 's#-l$(SCOTCHLIB)errexit#-l$(SCOTCHLIB)errexit -lm#g' esmumps/Makefile fi diff --git a/recipes/scotch/meta.yaml b/recipes/scotch/meta.yaml index f8547756953c2..b3374210a1c27 100755 --- a/recipes/scotch/meta.yaml +++ b/recipes/scotch/meta.yaml @@ -19,6 +19,7 @@ requirements: build: - toolchain - zlib 1.2.* + - gcc - bison - flex run: @@ -26,11 +27,11 @@ requirements: test: commands: - - test -f "${PREFIX}/lib/libscotch.a" - - test -f "${PREFIX}/lib/libscotcherr.a" - - test -f "${PREFIX}/lib/libscotcherrexit.a" - - test -f "${PREFIX}/lib/libscotchmetis.a" - - test -f "${PREFIX}/lib/libesmumps.a" + - test -f "${PREFIX}/lib/libscotch.o" + - test -f "${PREFIX}/lib/libscotcherr.o" + - test -f "${PREFIX}/lib/libscotcherrexit.o" + - test -f "${PREFIX}/lib/libscotchmetis.o" + - test -f "${PREFIX}/lib/libesmumps.o" - test -f "${PREFIX}/include/esmumps.h" - test -f "${PREFIX}/include/metis.h" - test -f "${PREFIX}/include/scotch.h" From 5a3c137ad186db7ad99846e42a052acd1455dbac Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Mon, 3 Oct 2016 17:19:35 +0200 Subject: [PATCH 29/30] fix test --- .../Makefile.inc.x86-64_pc_linux2.shlib | 21 ------------------- recipes/scotch/meta.yaml | 15 +++++++------ 2 files changed, 7 insertions(+), 29 deletions(-) delete mode 100644 recipes/scotch/Makefile.inc.x86-64_pc_linux2.shlib diff --git a/recipes/scotch/Makefile.inc.x86-64_pc_linux2.shlib b/recipes/scotch/Makefile.inc.x86-64_pc_linux2.shlib deleted file mode 100644 index 284bf917fd20d..0000000000000 --- a/recipes/scotch/Makefile.inc.x86-64_pc_linux2.shlib +++ /dev/null @@ -1,21 +0,0 @@ -EXE = -LIB = .so -OBJ = .o - -MAKE = make -AR = gcc -ARFLAGS = -shared -o -CAT = cat -CCS = gcc -CCP = mpicc -CCD = gcc -CFLAGS = -I${PREFIX}/include -O3 -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD -Drestrict=__restrict -DIDXSIZE64 -CLIBFLAGS = -shared -fPIC -LDFLAGS = -L${PREFIX}/lib -lz -lm -lrt -pthread -CP = cp -LEX = flex -Pscotchyy -olex.yy.c -LN = ln -MKDIR = mkdir -MV = mv -RANLIB = echo -YACC = bison -pscotchyy -y -b y \ No newline at end of file diff --git a/recipes/scotch/meta.yaml b/recipes/scotch/meta.yaml index b3374210a1c27..3feb06484a88b 100755 --- a/recipes/scotch/meta.yaml +++ b/recipes/scotch/meta.yaml @@ -18,20 +18,19 @@ build: requirements: build: - toolchain - - zlib 1.2.* - - gcc + - zlib 1.2.* - bison - flex run: - - zlib 1.2.* + - zlib 1.2.* test: commands: - - test -f "${PREFIX}/lib/libscotch.o" - - test -f "${PREFIX}/lib/libscotcherr.o" - - test -f "${PREFIX}/lib/libscotcherrexit.o" - - test -f "${PREFIX}/lib/libscotchmetis.o" - - test -f "${PREFIX}/lib/libesmumps.o" + - test -f "${PREFIX}/lib/libscotch.a" + - test -f "${PREFIX}/lib/libscotcherr.a" + - test -f "${PREFIX}/lib/libscotcherrexit.a" + - test -f "${PREFIX}/lib/libscotchmetis.a" + - test -f "${PREFIX}/lib/libesmumps.a" - test -f "${PREFIX}/include/esmumps.h" - test -f "${PREFIX}/include/metis.h" - test -f "${PREFIX}/include/scotch.h" From 763fcbd9a99194c04298db34bfc6965d8291cd28 Mon Sep 17 00:00:00 2001 From: Bas Nijholt Date: Mon, 3 Oct 2016 17:28:34 +0200 Subject: [PATCH 30/30] Revert to working commit --- recipes/scotch/Makefile.inc.x86-64_pc_linux2 | 42 ++++++++++---------- recipes/scotch/meta.yaml | 4 +- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/recipes/scotch/Makefile.inc.x86-64_pc_linux2 b/recipes/scotch/Makefile.inc.x86-64_pc_linux2 index 0ed81695c414f..b52ab6d1338cb 100644 --- a/recipes/scotch/Makefile.inc.x86-64_pc_linux2 +++ b/recipes/scotch/Makefile.inc.x86-64_pc_linux2 @@ -1,21 +1,21 @@ --EXE = - -LIB = .a - -OBJ = .o - - - -MAKE = make - -AR = ar - -ARFLAGS = -ruv - -CAT = cat - -CCS = gcc - -CCP = mpicc - -CCD = gcc - -CFLAGS = -I${PREFIX}/include -O3 -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD -Drestrict=__restrict -DIDXSIZE64 - -CLIBFLAGS = -fPIC - -LDFLAGS = -L${PREFIX}/lib -lz -lm -lrt -pthread - -CP = cp - -LEX = flex -Pscotchyy -olex.yy.c - -LN = ln - -MKDIR = mkdir - -MV = mv - -RANLIB = ranlib - -YACC = bison -pscotchyy -y -b y \ No newline at end of file +EXE = +LIB = .a +OBJ = .o + +MAKE = make +AR = ar +ARFLAGS = -ruv +CAT = cat +CCS = gcc +CCP = mpicc +CCD = gcc +CFLAGS = -I${PREFIX}/include -O3 -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD -Drestrict=__restrict -DIDXSIZE64 +CLIBFLAGS = -fPIC +LDFLAGS = -L${PREFIX}/lib -lz -lm -lrt -pthread +CP = cp +LEX = flex -Pscotchyy -olex.yy.c +LN = ln +MKDIR = mkdir +MV = mv +RANLIB = ranlib +YACC = bison -pscotchyy -y -b y diff --git a/recipes/scotch/meta.yaml b/recipes/scotch/meta.yaml index 3feb06484a88b..f8547756953c2 100755 --- a/recipes/scotch/meta.yaml +++ b/recipes/scotch/meta.yaml @@ -18,11 +18,11 @@ build: requirements: build: - toolchain - - zlib 1.2.* + - zlib 1.2.* - bison - flex run: - - zlib 1.2.* + - zlib 1.2.* test: commands: