-
Notifications
You must be signed in to change notification settings - Fork 166
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into ktf-patch-8
- Loading branch information
Showing
12 changed files
with
23 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
package: coconut | ||
version: "%(tag_basename)s" | ||
tag: "v1.23.0" | ||
tag: "v1.23.1" | ||
build_requires: | ||
- golang | ||
- protobuf | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
package: Control | ||
version: "v1.23.0" | ||
version: "v1.23.1" | ||
requires: | ||
- Control-Core | ||
- Control-OCCPlugin | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,38 +1,27 @@ | ||
package: libffi | ||
version: v3.2.1 | ||
version: v3.2.1-alice1 | ||
build_requires: | ||
- "autotools:(slc6|slc7)" | ||
- "GCC-Toolchain:(?!osx)" | ||
source: https://github.com/libffi/libffi | ||
- alibuild-recipe-tools | ||
source: https://github.com/alisw/libffi | ||
prepend_path: | ||
LD_LIBRARY_PATH: "$LIBFFI_ROOT/lib64" | ||
--- | ||
#!/bin/bash -ex | ||
rsync -a $SOURCEDIR/ . | ||
rsync -a "$SOURCEDIR"/ . | ||
autoreconf -ivf . | ||
MAKEINFO=: ./configure --prefix=$INSTALLROOT --disable-docs | ||
|
||
# Hack to bypass automake 1.17 creating a malformed Makefile on macOS | ||
# https://github.com/libffi/libffi/issues/853 | ||
mv -f Makefile_3.2.1_autoconf_2.69.in Makefile.in | ||
|
||
MAKEINFO=: ./configure --prefix="$INSTALLROOT" --disable-docs --disable-multi-os-directory | ||
make ${JOBS:+-j $JOBS} MAKEINFO=: | ||
make install MAKEINFO=: | ||
|
||
LIBPATH=$(find $INSTALLROOT -name libffi.so -o -name libffi.dylib -o -name libffi.a | head -n 1) | ||
# Do not install info documentation | ||
rm -fr "$INSTALLROOT/share/info" | ||
|
||
# Modulefile | ||
MODULEDIR="$INSTALLROOT/etc/modulefiles" | ||
MODULEFILE="$MODULEDIR/$PKGNAME" | ||
mkdir -p "$MODULEDIR" | ||
cat > "$MODULEFILE" <<EoF | ||
#%Module1.0 | ||
proc ModulesHelp { } { | ||
global version | ||
puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@" | ||
} | ||
set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@ | ||
module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@" | ||
# Dependencies | ||
module load BASE/1.0 | ||
# Our environment | ||
set LIBFFI_ROOT \$::env(BASEDIR)/$PKGNAME/\$version | ||
prepend-path LD_LIBRARY_PATH \$LIBFFI_ROOT/$(basename $(dirname $LIBPATH)) | ||
EoF | ||
mkdir -p "$INSTALLROOT/etc/modulefiles" | ||
alibuild-generate-module --lib > "$INSTALLROOT/etc/modulefiles/$PKGNAME" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters