Skip to content

Commit

Permalink
Merge branch 'master' into ktf-patch-8
Browse files Browse the repository at this point in the history
  • Loading branch information
singiamtel authored Nov 11, 2024
2 parents 652bb51 + 54dcbff commit a4da92a
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 34 deletions.
2 changes: 1 addition & 1 deletion coconut.sh
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
Expand Down
2 changes: 1 addition & 1 deletion control-core.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package: Control-Core
version: "%(tag_basename)s"
tag: "v1.23.0"
tag: "v1.23.1"
build_requires:
- "GCC-Toolchain:(?!osx)"
- golang
Expand Down
2 changes: 1 addition & 1 deletion control-occplugin.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package: Control-OCCPlugin
version: "%(tag_basename)s"
tag: "v1.23.0"
tag: "v1.23.1"
requires:
- FairMQ
- FairLogger
Expand Down
2 changes: 1 addition & 1 deletion control.sh
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
Expand Down
2 changes: 1 addition & 1 deletion dds.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package: DDS
version: "%(tag_basename)s"
tag: "3.10"
tag: "3.11"
source: https://github.com/FairRootGroup/DDS
requires:
- boost
Expand Down
2 changes: 1 addition & 1 deletion epos4.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package: EPOS4
version: "%(tag_basename)s"
tag: "v4.0.0-alice4"
tag: "v4.0.0-alice5"
source: https://github.com/alisw/EPOS4.git
requires:
- ROOT
Expand Down
35 changes: 12 additions & 23 deletions libffi.sh
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"
2 changes: 1 addition & 1 deletion o2.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package: O2
version: "%(tag_basename)s"
tag: "daily-20241028-0100"
tag: "daily-20241111-0000"
requires:
- abseil
- arrow
Expand Down
2 changes: 1 addition & 1 deletion o2dpg.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package: O2DPG
version: "%(tag_basename)s"
tag: "daily-20241028-0100"
tag: "daily-20241111-0000"
source: https://github.com/AliceO2Group/O2DPG.git
build_requires:
- alibuild-recipe-tools
Expand Down
2 changes: 1 addition & 1 deletion o2pdpsuite.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package: O2PDPSuite
version: "%(tag_basename)s"
tag: "daily-20241028-0100"
tag: "daily-20241111-0000"
requires:
# List important packages separately, even though they're also
# pulled in by O2sim, so they show up in the dependency list on Monalisa.
Expand Down
2 changes: 1 addition & 1 deletion o2physics.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package: O2Physics
version: "%(tag_basename)s"
tag: "daily-20241028-0100"
tag: "daily-20241111-0000"
requires:
- O2
- ONNXRuntime
Expand Down
2 changes: 1 addition & 1 deletion qualitycontrol.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package: QualityControl
version: "%(tag_basename)s"
tag: v1.162.1
tag: v1.162.5
requires:
- boost
- "GCC-Toolchain:(?!osx)"
Expand Down

0 comments on commit a4da92a

Please sign in to comment.