Skip to content

Commit 30150cb

Browse files
cekeescekees
committed
Merge remote-tracking branch 'ssh/master'
2 parents b226d41 + d978b36 commit 30150cb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+728
-287
lines changed

‎base/cmake_package.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ def configure(ctx, stage_args):
3434
else:
3535
conf_lines.append('-DCMAKE_BUILD_TYPE:STRING=Release')
3636

37+
if ctx.parameters['platform'] == 'Darwin':
38+
conf_lines.append('-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=""')
39+
3740
#cmake needs to be given all the dependency dirs as prefix paths
3841
#so that we search the hashdist directories before the system directories
3942
#CMake doesn't use the CPPFLAGS implicitly to find libraries

‎base/setuptools_package.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ build_stages:
2222
handler: bash
2323
bash: |
2424
${PYTHON} -c 'import setuptools; __file__="setup.py"; exec(open(__file__).read())' \
25+
${SETUPTOOLS_PACKAGE_EXTRA_OPTIONS} \
2526
install \
2627
--prefix=. --root=${ARTIFACT} \
2728
--single-version-externally-managed

‎examples/hd_base.Darwin.yaml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# This profile builds with the default clang compiler on Mac OS X 10.10
2+
# Yosemite. In particular it builds gcc (g++, gcc, gfortran). This profile can
3+
# then be used as a base for building the rest of Hashstack.
4+
5+
extends:
6+
- file: config.yaml
7+
8+
parameters:
9+
platform: Darwin
10+
fortran: false
11+
PATH: /usr/bin:/bin:/usr/sbin:/sbin
12+
PROLOGUE: |
13+
export MACOSX_DEPLOYMENT_TARGET=$(sw_vers -productVersion | sed -E "s/([0-9]+\.[0-9]+).*/\1/")
14+
15+
packages:
16+
17+
launcher:
18+
blas:
19+
use: host-osx-framework-accelerate
20+
lapack:
21+
use: host-osx-framework-accelerate
22+
mpi:
23+
use: mpich
24+
python:
25+
link: shared
26+
swig:
27+
build_with: |
28+
perl
29+
ipython:
30+
nose:
31+
numpy:
32+
sphinx:
33+
sympy:
34+
gmp:
35+
matplotlib:
36+
doxygen:
37+
breathe:
38+
gcc:
39+
git:
40+
perl:
41+
pyliblzma:

‎examples/proteus.Darwin.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ packages:
4444
debug: false
4545
petsc4py:
4646
with_conf: true
47+
pillow:
4748
pytables:
4849
sphinx:
4950
superlu:

‎examples/proteus.linux2.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ packages:
4343
debug: false
4444
petsc4py:
4545
with_conf: true
46+
pillow:
4647
pytables:
4748
sphinx:
4849
superlu:

‎pkgs/Tempita.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
extends: [setuptools_package]
2+
3+
dependencies:
4+
build: []
5+
run: []
6+
7+
sources:
8+
- key: tar.gz:ha4sxnyiueasqqm7ox5jcifg2lencnyb
9+
url: https://pypi.python.org/packages/source/T/Tempita/Tempita-0.5.3dev.tar.gz

‎pkgs/ansible.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ dependencies:
55
run: [paramiko, jinja2, yaml]
66

77
sources:
8-
- key: tar.gz:2n6ajm5lz2nqg2tmqmi7zszwbrolypwi
9-
url: https://pypi.python.org/packages/source/a/ansible/ansible-1.8.4.tar.gz
8+
- key: tar.gz:wimt7wneaynlmjh2m4yrpfsbtj2z3ydl
9+
url: https://pypi.python.org/packages/source/a/ansible/ansible-1.9.0.1.tar.gz

‎pkgs/backports-ssl_match_hostname.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
extends: [setuptools_package]
2+
3+
sources:
4+
- key: tar.gz:a5aq475qtkvxxwxv4ymn4zwd3lee4lr5
5+
url: https://pypi.python.org/packages/source/b/backports.ssl_match_hostname/backports.ssl_match_hostname-3.4.0.2.tar.gz

‎pkgs/bddc.yaml

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,42 @@ dependencies:
33
build: [mpi, lapack, mumps, blopex, parmetis, scalapack]
44

55
sources:
6-
- url: https://github.com/certik/bddc.git
7-
key: git:3d6cfa120682be5925861c022bd3a3f2c5d77940
6+
- key: git:acd093697417f49ec856b69e2d8b442e5adbbe85
7+
url: https://github.com/certik/bddc.git
8+
9+
defaults:
10+
# Build in Debug mode (debug symbols, bounds checks, ...)
11+
debug: false
812

913
build_stages:
1014

15+
- when: debug
16+
name: debug-flags
17+
after: prologue
18+
before: make-configure
19+
handler: bash
20+
bash: |
21+
FFLAGS="-g -C -Wall -fbounds-check"
22+
CFLAGS="-g -Wall"
23+
24+
- when: not debug
25+
name: debug-flags
26+
after: prologue
27+
before: make-configure
28+
handler: bash
29+
bash: |
30+
FFLAGS="-C -Wall -O3 -march=native -ffast-math -funroll-loops"
31+
CFLAGS="-Wall -O3 -march=native -ffast-math -funroll-loops"
32+
1133
- name: make-configure
1234
after: prologue
1335
handler: bash
1436
bash: |
1537
cp make.inc.example make.inc
1638
make \
1739
BDDCML_ROOT=$ARTIFACT \
40+
BDDCML_MPFFLAGS="$FFLAGS" \
41+
BDDCML_MPCFLAGS="$CFLAGS" \
1842
BDDCML_INCPARMETIS=-I$PARMETIS_DIR/include \
1943
BDDCML_LIBPARMETIS="-L$PARMETIS_DIR/lib -Wl,-rpath=${PARMETIS_DIR}/lib -lparmetis" \
2044
BDDCML_INCMETIS= \
@@ -27,7 +51,9 @@ build_stages:
2751
BDDCML_LIBSCALAPACK="-L$SCALAPACK_DIR/lib -Wl,-rpath=${SCALAPACK_DIR}/lib -lscalapack" \
2852
BDDCML_LIBLAPACK="-L$LAPACK_DIR/lib -Wl,-rpath=${LAPACK_DIR}/lib -llapack" \
2953
BDDCML_LIBBLAS="-lblas" \
30-
BDDCML_LIBBLACS=
31-
mkdir -p $ARTIFACT/bin
54+
BDDCML_LIBBLACS= \
55+
-j 1 # The BDDC's makefile system doesn't work in parallel
56+
mkdir -p $ARTIFACT/bin $ARTIFACT/include
57+
cp src/bddcml_interface_fortran.mod $ARTIFACT/include/
3258
cd examples
3359
cp bddcml_global bddcml_local poisson_on_cube $ARTIFACT/bin/

‎pkgs/boost/boost.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ build_stages:
9191
after: bjam
9292
handler: bash
9393
bash: |
94-
for lib in ${ARTIFACT}/lib/*.so; do
94+
for lib in ${ARTIFACT}/lib/*.so.*; do
9595
${PATCHELF} --set-rpath ${ARTIFACT}/lib:${BZIP2_DIR}/lib:${ZLIB_DIR}/lib ${lib}
9696
done
9797

‎pkgs/buildbot.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
extends: [distutils_package]
22

33
dependencies:
4-
build: [SQLAlchemy, SQLAlchemy-Migrate, jinja2, Twisted, sqlite, python-dateutil, setuptools]
5-
run: [SQLAlchemy, SQLAlchemy-Migrate, jinja2, Twisted, sqlite, python-dateutil]
4+
build: [SQLAlchemy, SQLAlchemy-Migrate, jinja2, Twisted, sqlite, python-dateutil, Tempita, decorator, MarkupSafe, zope-interface, setuptools]
5+
run: [SQLAlchemy, SQLAlchemy-Migrate, jinja2, Twisted, sqlite, python-dateutil, Tempita, decorator, MarkupSafe, zope-interface]
66

77
sources:
88
- key: zip:tsyafdgdsontllm5ujazrcbcnysx3o2g

‎pkgs/cmake.yaml

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,36 @@
11
extends: [autotools_package]
22

3+
dependencies:
4+
build: [zlib, bzip2, curl, openssl, libidn, expat]
5+
36
sources:
4-
- key: tar.gz:kcrzjtzo7wnjfxkbctv6fgmurgmezzxg
5-
url: http://www.cmake.org/files/v3.2/cmake-3.2.0-rc1.tar.gz
7+
- key: tar.gz:vxuu43rwaodxivs7flwyqzsbkrbuit5x
8+
url: http://www.cmake.org/files/v3.2/cmake-3.2.2.tar.gz
69

710
build_stages:
11+
- when: platform == 'Darwin'
12+
name: fix_deployment_target
13+
after: prologue
14+
before: configure
15+
handler: bash
16+
bash: |
17+
unset MACOSX_DEPLOYMENT_TARGET
18+
819
- name: configure
9-
extra: ['--parallel=${HASHDIST_CPU_COUNT}']
20+
extra: ['--parallel=${HASHDIST_CPU_COUNT}',
21+
'--system-bzip2',
22+
'--system-curl',
23+
'--system-expat',
24+
#'--system-jsoncpp',
25+
#'--system-libarchive',
26+
'--system-zlib',
27+
'--',
28+
'-DCMAKE_PREFIX_PATH=${CURL_DIR}/lib;${ZLIB_DIR}/lib;${BZIP2_DIR}/lib;${EXPAT_DIR}/lib',
29+
'-DCURL_INCLUDE_DIR=${CURL_DIR}/include',
30+
'-DZLIB_INCLUDE_DIR=${ZLIB_DIR}/include',
31+
'-DBZIP2_INCLUDE_DIR=${BZIP2_DIR}/include',
32+
'-DEXPAT_INCLUDE_DIR=${EXPAT_DIR}/include',
33+
]
1034

1135
when_build_dependency:
1236
- set: CMAKE

‎pkgs/coffeescript.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
extends: [base_package]
2+
dependencies:
3+
build: [node]
4+
5+
defaults:
6+
relocatable: false
7+
8+
sources:
9+
- key: tar.gz:uwx36n3nhdu7dwxtwp46sffv3t3orhtw
10+
url: https://github.com/jashkenas/coffeescript/archive/1.9.1.tar.gz
11+
12+
build_stages:
13+
- name: install
14+
mode: replace
15+
handler: bash
16+
after: prologue
17+
bash: |
18+
"$NODE_DIR"/bin/npm --proxy 127.0.0.1:2 --production --global \
19+
--prefix="$ARTIFACT" install .
20+

‎pkgs/cryptography.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
extends: [setuptools_package]
22

33
dependencies:
4-
build: [six, cffi, cryptography-vectors, openssl, pytest]
4+
build: [six, cffi, cryptography-vectors, openssl, pytest, pycparser]
55
run: []
66

77
sources:

‎pkgs/decorator.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
extends: [setuptools_package]
2+
3+
dependencies:
4+
build: []
5+
run: []
6+
7+
sources:
8+
- key: tar.gz:omqaalhgdxvgvisk3skf3hlyggzwnfkt
9+
url: https://pypi.python.org/packages/source/d/decorator/decorator-3.4.2.tar.gz

‎pkgs/doxygen.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
extends: [autotools_package]
22

33
dependencies:
4-
build: [bison]
4+
build: [bison, flex]
55

66
sources:
77
- url: https://github.com/doxygen/doxygen.git

‎pkgs/gcc/gcc.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,16 @@ build_stages:
2222
patch -up1 < _hashdist/rpath.patch
2323
sed -i "s|@@ARTIFACT@@|${ARTIFACT}|g" gcc/config/i386/gnu-user.h gcc/config/i386/gnu-user64.h
2424
25+
- when: platform == 'Darwin'
26+
name: fix_object_h
27+
before: configure
28+
handler: bash
29+
bash: |
30+
if [ -f /usr/include/dispatch/object.h ]; then
31+
mkdir -p "$ARTIFACT/include/dispatch"
32+
sed 's+typedef void (\^dispatch_block_t)(void)+typedef void* dispatch_block_t+' /usr/include/dispatch/object.h > "$ARTIFACT/include/dispatch/object.h"
33+
fi
34+
2535
- name: link_lib64_to_lib
2636
after: install
2737
handler: bash

‎pkgs/gdb.yaml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
11
extends: [autotools_package]
22

33
dependencies:
4-
build: [python, expat, xz, ncurses, libiconv, zlib, {{build_with}}]
4+
build: [python, expat, xz, ncurses, libiconv, zlib, readline, {{build_with}}]
55

66
sources:
7-
- key: tar.bz2:bw6veycan4nqy4h46at4msefe75n3ygn
8-
url: http://ftp.gnu.org/gnu/gdb/gdb-7.7.1.tar.bz2
7+
- key: tar.xz:tmyvmunbmuuppl4mpwbii2m7wdewlxzr
8+
url: https://ftp.gnu.org/gnu/gdb/gdb-7.9.tar.xz
9+
10+
defaults:
11+
# lib/libbfd.a contains hard-coded path
12+
relocatable: false
913

1014
build_stages:
15+
- name: configure
16+
global_flags: true
17+
extra: ['--with-system-readline']
18+
1119
- name: fail_on_osx
1220
before: prologue
1321
mode: replace

‎pkgs/genshi.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
extends: [setuptools_package]
2+
3+
dependencies:
4+
build: []
5+
run: []
6+
7+
sources:
8+
- key: zip:ptgbosdhel3aawcwn3pqmd6iy2xqvqkv
9+
url: https://pypi.python.org/packages/source/G/Genshi/Genshi-0.7.zip

‎pkgs/geos.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,7 @@ extends: [autotools_package]
33
sources:
44
- url: http://download.osgeo.org/geos/geos-3.4.2.tar.bz2
55
key: tar.bz2:cxul7x36feehvfl3k2wfipvjvabscsa4
6+
7+
when_build_dependency:
8+
- prepend_path: PATH
9+
value: '${ARTIFACT}/bin'

‎pkgs/git.yaml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ dependencies:
44
build: [curl, pcre, openssl, libiconv, gettext, expat, zlib, perl]
55

66
sources:
7-
- key: tar.gz:xix6qfhhbgs5b4bu5pucba74477o2cez
8-
url: http://www.kernel.org/pub/software/scm/git/git-2.3.0.tar.gz
7+
- key: tar.gz:2wghm2ua3bvf4gcgybghiymotc76yfmh
8+
url: https://www.kernel.org/pub/software/scm/git/git-2.4.0.tar.gz
99

1010
defaults:
1111
# /bin/git contains hard-coded path
1212
relocatable: false
13+
disable_crypto: false
1314

1415
build_stages:
1516

@@ -19,6 +20,13 @@ build_stages:
1920
bash: |
2021
export PERL_PATH="/usr/bin/env perl"
2122
23+
- when: platform == 'Darwin' and disable_crypto
24+
name: fix_crypto_compile_failure
25+
before: configure
26+
handler: bash
27+
bash: |
28+
export NO_APPLE_COMMON_CRYPTO=1
29+
2230
- name: configure
2331
mode: override
2432
extra: ['--with-libpcre=${PCRE_DIR}', '--with-zlib=${ZLIB_DIR}', '--with-iconv=${LIBICONV_DIR}', '--with-expat=${EXPAT_DIR}', '--with-curl=${CURL_DIR}']

‎pkgs/glm.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
extends: [cmake_package]
2+
dependencies:
3+
build: []
4+
5+
sources:
6+
- key: zip:crsrwvvrb6tibasenlfpniirnvllov6i
7+
url: http://downloads.sourceforge.net/project/ogl-math/glm-0.9.6.3/glm-0.9.6.3.zip

‎pkgs/gmp.yaml

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)