Skip to content

Commit b402bc9

Browse files
authored
bump infologger (#5325)
* bump infologger * Update libinfologger.sh * fix incremental recipe ninja * Update swig.sh bump swig version 4.2.0 download source tarball to avoid dependency on bison 3.5
1 parent 92bb175 commit b402bc9

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

infologger.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package: InfoLogger
22
version: "%(tag_basename)s"
3-
tag: v2.5.3
3+
tag: v2.6.0
44
requires:
55
- boost
66
- "GCC-Toolchain:(?!osx)"
@@ -11,7 +11,7 @@ build_requires:
1111
- SWIG
1212
source: https://github.com/AliceO2Group/InfoLogger
1313
incremental_recipe: |
14-
make ${JOBS:+-j$JOBS} install
14+
ninja ${JOBS:+-j$JOBS} install
1515
mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
1616
---
1717
#!/bin/bash -ex

libinfologger.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package: libInfoLogger
22
version: "%(tag_basename)s"
3-
tag: v2.5.3
3+
tag: v2.6.0
44
requires:
55
- boost
66
- "GCC-Toolchain:(?!osx)"

swig.sh

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,23 @@
11
package: SWIG
2-
version: 3.0.12
3-
tag: rel-3.0.12
4-
source: https://github.com/swig/swig
2+
version: 4.2.0
53
build_requires:
64
- "autotools:(slc6|slc7)"
75
- "GCC-Toolchain:(?!osx)"
8-
- yacc-like
6+
- curl
97
env:
108
SWIG_LIB: "$SWIG_ROOT/share/swig/$SWIG_VERSION"
119
prefer_system: (?!slc5)
1210
prefer_system_check: |
1311
verge() {
1412
[ "$1" = "`echo -e "$1\n$2" | sort -V | head -n1`" ]
1513
}
16-
# Check for swig 3.0.12 or later
17-
which swig && verge 3.0.12 $(swig -version | grep Version | sed -e 's/[^0-9]*//')
14+
# Check for swig version or later
15+
which swig && verge "$PKGVERSION" $(swig -version | grep Version | sed -e 's/[^0-9]*//')
1816
---
1917
#!/bin/sh
18+
URL=http://prdownloads.sourceforge.net/swig/swig-${PKGVERSION}.tar.gz
19+
curl -L $URL | tar --strip-components 1 -C "$SOURCEDIR" -xvvz
2020
rsync -av --delete --exclude '**/.git' $SOURCEDIR/ .
21-
./autogen.sh
2221
./configure --disable-ccache --without-pcre --prefix=$INSTALLROOT
2322
make ${JOBS+-j $JOBS}
2423
make ${JOBS+-j $JOBS} install

0 commit comments

Comments
 (0)