Skip to content

Commit 843b50a

Browse files
authored
Bump json-c to v17.0 (#5603)
1 parent 2e1b8ad commit 843b50a

File tree

1 file changed

+13
-26
lines changed

1 file changed

+13
-26
lines changed

json-c.sh

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,20 @@
11
package: json-c
2-
version: "v0.13.1"
3-
tag: "json-c-0.13.1-20180305"
2+
version: "v0.17.0"
3+
tag: "json-c-0.17-20230812"
44
source: https://github.com/json-c/json-c
55
build_requires:
6-
- "autotools:(slc6|slc7)"
6+
- CMake
77
- "GCC-Toolchain:(?!osx)"
8+
- alibuild-recipe-tools
89
---
910
#!/bin/bash -e
10-
rsync -a --delete --exclude '**/.git' --delete-excluded $SOURCEDIR/ ./
11-
autoreconf -ivf
12-
./configure --disable-shared --enable-static --prefix="$INSTALLROOT"
13-
make ${JOBS+-j $JOBS} install
1411

15-
# Modulefile
16-
mkdir -p etc/modulefiles
17-
cat > etc/modulefiles/$PKGNAME <<EoF
18-
#%Module1.0
19-
proc ModulesHelp { } {
20-
global version
21-
puts stderr "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
22-
}
23-
set version $PKGVERSION-@@PKGREVISION@$PKGHASH@@
24-
module-whatis "ALICE Modulefile for $PKGNAME $PKGVERSION-@@PKGREVISION@$PKGHASH@@"
25-
# Dependencies
26-
module load BASE/1.0 ${GCC_TOOLCHAIN_REVISION:+GCC-Toolchain/$GCC_TOOLCHAIN_VERSION-$GCC_TOOLCHAIN_REVISION}
27-
# Our environment
28-
set JSON_C_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
29-
setenv JSON_C_ROOT \$JSON_C_ROOT
30-
prepend-path PATH \$JSON_C_ROOT/bin
31-
prepend-path LD_LIBRARY_PATH \$JSON_C_ROOT/lib
32-
EoF
33-
mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles
12+
cmake "$SOURCEDIR" \
13+
-DCMAKE_INSTALL_PREFIX="$INSTALLROOT" \
14+
-DBUILD_SHARED_LIBS=OFF \
15+
${CMAKE_BUILD_TYPE:+-DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE}
16+
17+
cmake --build . --target install ${JOBS:+-- -j$JOBS}
18+
19+
mkdir -p "$INSTALLROOT/etc/modulefiles"
20+
alibuild-generate-module --bin --lib --cmake > "$INSTALLROOT/etc/modulefiles/$PKGNAME"

0 commit comments

Comments
 (0)