From c46811361fed22bde2e5f5272cea2b6cb9c8e872 Mon Sep 17 00:00:00 2001 From: Matthew Gidden Date: Tue, 2 Jun 2015 10:58:24 -0500 Subject: [PATCH 1/4] build string for all --- conda-recipes/boost/meta.yaml | 2 +- conda-recipes/gettext/meta.yaml | 2 +- conda-recipes/glib/meta.yaml | 2 +- conda-recipes/glibmm/meta.yaml | 2 +- conda-recipes/libffi/meta.yaml | 2 +- conda-recipes/libxml2/meta.yaml | 2 +- conda-recipes/libxmlpp/meta.yaml | 2 +- conda-recipes/pkg-config-lite/meta.yaml | 2 +- conda-recipes/sigcpp/meta.yaml | 2 +- conda-recipes/xz/meta.yaml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/conda-recipes/boost/meta.yaml b/conda-recipes/boost/meta.yaml index 4fa39e4..92c6359 100644 --- a/conda-recipes/boost/meta.yaml +++ b/conda-recipes/boost/meta.yaml @@ -7,7 +7,7 @@ source: url: http://sourceforge.net/projects/boost/files/boost/1.50.0/boost_1_50_0.tar.gz build: - number: 2 [osx] + number: 0 requirements: build: - xz diff --git a/conda-recipes/gettext/meta.yaml b/conda-recipes/gettext/meta.yaml index a9ff3b8..505025f 100644 --- a/conda-recipes/gettext/meta.yaml +++ b/conda-recipes/gettext/meta.yaml @@ -7,7 +7,7 @@ source: url: http://ftp.gnu.org/gnu/gettext/gettext-0.18.3.tar.gz build: - number: 2 [osx] + number: 0 requirements: build: diff --git a/conda-recipes/glib/meta.yaml b/conda-recipes/glib/meta.yaml index c9d15e8..5ad6bc1 100644 --- a/conda-recipes/glib/meta.yaml +++ b/conda-recipes/glib/meta.yaml @@ -7,7 +7,7 @@ source: url: http://ftp.acc.umu.se/pub/GNOME/sources/glib/2.37/glib-2.37.4.tar.xz build: - number: 2 [osx] + number: 0 # the build and runtime requirements. Dependencies of these requirements # # are included automatically. diff --git a/conda-recipes/glibmm/meta.yaml b/conda-recipes/glibmm/meta.yaml index 8954f9d..2f9c898 100644 --- a/conda-recipes/glibmm/meta.yaml +++ b/conda-recipes/glibmm/meta.yaml @@ -7,7 +7,7 @@ source: url: http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.32/glibmm-2.32.1.tar.xz build: - number: 2 [osx] + number: 0 # the build and runtime requirements. Dependencies of these requirements # # are included automatically. diff --git a/conda-recipes/libffi/meta.yaml b/conda-recipes/libffi/meta.yaml index 50bc3d7..70e79f3 100644 --- a/conda-recipes/libffi/meta.yaml +++ b/conda-recipes/libffi/meta.yaml @@ -7,7 +7,7 @@ source: url: ftp://sourceware.org/pub/libffi/libffi-3.0.13.tar.gz build: - number: 2 [osx] + number: 0 about: home: libffi diff --git a/conda-recipes/libxml2/meta.yaml b/conda-recipes/libxml2/meta.yaml index 2de30dd..c05e10f 100644 --- a/conda-recipes/libxml2/meta.yaml +++ b/conda-recipes/libxml2/meta.yaml @@ -7,7 +7,7 @@ source: url: ftp://xmlsoft.org/libxml2/libxml2-2.8.0.tar.gz build: - number: 2 [osx] + number: 0 requirements: build: diff --git a/conda-recipes/libxmlpp/meta.yaml b/conda-recipes/libxmlpp/meta.yaml index 0346875..635e148 100644 --- a/conda-recipes/libxmlpp/meta.yaml +++ b/conda-recipes/libxmlpp/meta.yaml @@ -7,7 +7,7 @@ source: url: http://ftp.gnome.org/pub/GNOME/sources/libxml++/2.36/libxml++-2.36.0.tar.xz build: - number: 2 [osx] + number: 0 requirements: build: diff --git a/conda-recipes/pkg-config-lite/meta.yaml b/conda-recipes/pkg-config-lite/meta.yaml index e55ac70..d3d85f8 100644 --- a/conda-recipes/pkg-config-lite/meta.yaml +++ b/conda-recipes/pkg-config-lite/meta.yaml @@ -7,7 +7,7 @@ source: url: http://sourceforge.net/projects/pkgconfiglite/files/0.28-1/pkg-config-lite-0.28-1.tar.gz build: - number: 2 [osx] + number: 0 about: diff --git a/conda-recipes/sigcpp/meta.yaml b/conda-recipes/sigcpp/meta.yaml index d8c4204..41b390c 100644 --- a/conda-recipes/sigcpp/meta.yaml +++ b/conda-recipes/sigcpp/meta.yaml @@ -7,7 +7,7 @@ source: url: http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.3/libsigc++-2.3.1.tar.xz build: - number: 2 [osx] + number: 0 about: diff --git a/conda-recipes/xz/meta.yaml b/conda-recipes/xz/meta.yaml index 5bc7661..0cf6d37 100644 --- a/conda-recipes/xz/meta.yaml +++ b/conda-recipes/xz/meta.yaml @@ -7,7 +7,7 @@ source: url: http://tukaani.org/xz/xz-5.0.5.tar.gz build: - number: 2 [osx] + number: 0 about: home: tukaani From 1d142583d0c35ad26c7783915401c87a9b11ed2d Mon Sep 17 00:00:00 2001 From: Matthew Gidden Date: Tue, 2 Jun 2015 11:28:33 -0500 Subject: [PATCH 2/4] fix up glib build script --- conda-recipes/glib/build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/conda-recipes/glib/build.sh b/conda-recipes/glib/build.sh index 413d352..7051a77 100644 --- a/conda-recipes/glib/build.sh +++ b/conda-recipes/glib/build.sh @@ -34,7 +34,9 @@ set -e #PKG_CONFIG_PATH= #./configure -h export DYLD_LIBRARY_PATH=$PREFIX/lib -./configure --prefix=$PREFIX PKG_CONFIG=$PREFIX/bin/pkg-config PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig LD_LIBRARY_PATH=/$PREFIX/lib/ CPPFLAGS=-I/$PREFIX/include LDFLAGS=-L/$PREFIX/lib +export LIBFFI_CFLAGS=-I$PREFIX/lib/libffi-3.0.11/include +export LIBFFI_LIBS="-L$PREFIX/lib -lffi" +./configure --prefix=$PREFIX PKG_CONFIG=$PREFIX/bin/pkg-config PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig LD_LIBRARY_PATH=$PREFIX/lib/ CPPFLAGS=-I$PREFIX/include LDFLAGS=-L$PREFIX/lib make make install From 298e3c8155cc8f1ffb3e5e4a596a71eb8734d036 Mon Sep 17 00:00:00 2001 From: Matthew Gidden Date: Tue, 2 Jun 2015 13:42:56 -0500 Subject: [PATCH 3/4] cyclus deps updates. fully installs cyclus and cycamore from source on fresh ubuntu 15.04 --- conda-recipes/cyclus-deps/meta.yaml | 22 ++++++++++++------- conda-recipes/cyclus-deps/post-link.sh | 29 +------------------------- 2 files changed, 15 insertions(+), 36 deletions(-) diff --git a/conda-recipes/cyclus-deps/meta.yaml b/conda-recipes/cyclus-deps/meta.yaml index 98e7676..0406d80 100644 --- a/conda-recipes/cyclus-deps/meta.yaml +++ b/conda-recipes/cyclus-deps/meta.yaml @@ -1,17 +1,14 @@ package: name: cyclus-deps - version: 1.0 + version: 9999 -source: - #fn: develop.zip # [linux] - #url: https://github.com/cyclus/cyclus/archive/develop.zip # [linux] - git_url: https://github.com/cyclus/cyclus.git - git_tag: develop #17716084c828a56964c36cf7c5e8c9a0aba39fde requirements: build: - sigcpp + - myglib - glibmm - - libxmlpp + - libxmlpp + - bzip2 - coincbc - boost - hdf5 @@ -23,10 +20,15 @@ requirements: - pkg-config-lite # [osx] - cmake - python + - nose + - pytables + run: - sigcpp + - myglib - glibmm - libxmlpp + - bzip2 - coincbc - boost - hdf5 @@ -36,9 +38,13 @@ requirements: - libffi # [osx] - gettext # [osx] - pkg-config-lite # [osx] + - cmake + - python + - nose + - pytables build: - number: 2 + string: 0 about: home: Cyclus diff --git a/conda-recipes/cyclus-deps/post-link.sh b/conda-recipes/cyclus-deps/post-link.sh index cba08b3..b19f0f3 100755 --- a/conda-recipes/cyclus-deps/post-link.sh +++ b/conda-recipes/cyclus-deps/post-link.sh @@ -1,30 +1,3 @@ -#/bin/bash -mv $PREFIX/bin/cyclus $PREFIX/bin/cyclus_base -echo " -#!/bin/bash -export LD_LIBRARY_PATH=$PREFIX/lib:$PREFIX/lib/cyclus -export DYLD_FALLBACK_LIBRARY_PATH=$PREFIX/lib/cyclus -export CYCLUS_NUC_DATA=$PREFIX/share/cyclus/cyclus_nuc_data.h5 -export CYCLUS_PATH=$PREFIX/lib/cyclus -export CYCLUS_RNG_SCHEMA=$PREFIX/share/cyclus/cyclus.rng.in - -$PREFIX/bin/cyclus_base \$* - -" > $PREFIX/bin/cyclus -chmod 755 $PREFIX/bin/cyclus - -mv $PREFIX/bin/cyclus_unit_tests $PREFIX/bin/cyclus_unit_tests_base -echo " -#!/bin/bash -export LD_LIBRARY_PATH=$PREFIX/lib:$PREFIX/lib/cyclus - export DYLD_FALLBACK_LIBRARY_PATH=$PREFIX/lib/cyclus -export CYCLUS_NUC_DATA=$PREFIX/share/cyclus/cyclus_nuc_data.h5 -export CYCLUS_PATH=$PREFIX/lib/cyclus -export CYCLUS_RNG_SCHEMA=$PREFIX/share/cyclus/cyclus.rng.in - -$PREFIX/bin/cyclus_unit_tests_base \$* - -" > $PREFIX/bin/cyclus_unit_tests -chmod 755 $PREFIX/bin/cyclus_unit_tests +echo "post-link.sh, PREFIX: $PREFIX" From 614ee7c53cee0aa1310b25150bdcf2ba55e4f4bf Mon Sep 17 00:00:00 2001 From: Matthew Gidden Date: Wed, 3 Jun 2015 16:39:33 -0500 Subject: [PATCH 4/4] update cyclist version --- conda-recipes/cyclist/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda-recipes/cyclist/meta.yaml b/conda-recipes/cyclist/meta.yaml index 885fd67..a8c9059 100644 --- a/conda-recipes/cyclist/meta.yaml +++ b/conda-recipes/cyclist/meta.yaml @@ -1,13 +1,13 @@ package: name: cyclist - version: 0.9.3 + version: 1.3 source: # keep these commented lines for batlab #fn: 0.9.3.tar.gz #url: https://github.com/cyclus/cyclist2/archive/0.9.3.tar.gz git_url: http://github.com/cyclus/cyclist2.git - git_tag: 0.9.3 + git_branch: v1.3.0-release requirements: build: