Skip to content

Commit 6493e0d

Browse files
committed
Fix trafficserver build.
The pkg_config approach wouldn't work with our staged builds, since the path it picked up for luajit didn't exist until everything was actually installed. So more explicitly configure the luajit paths to use the staged locations.
1 parent 48e85a8 commit 6493e0d

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

tasks/deps/trafficserver

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,20 @@ extract_download "trafficserver-$trafficserver_version.tar.bz2"
1313

1414
cd "trafficserver-$trafficserver_version"
1515

16-
PKG_CONFIG_PATH="$STAGE_EMBEDDED_DIR/openresty/luajit/lib/pkgconfig:${PKG_CONFIG_PATH:-}" \
1716
cmake -B build \
1817
-DCMAKE_INSTALL_PREFIX="$INSTALL_PREFIX_EMBEDDED" \
1918
-DENABLE_LUAJIT=ON \
19+
-Dluajit_INCLUDE_DIRS="$STAGE_EMBEDDED_DIR/openresty/luajit/include/luajit-2.1" \
20+
-Dluajit_LIBRARY_DIRS="$STAGE_EMBEDDED_DIR/openresty/luajit/lib" \
21+
-Dluajit_LIBRARIES=luajit-5.1 \
22+
-Dluajit_LINK_LIBRARIES=luajit-5.1 \
2023
-DENABLE_JEMALLOC=ON
2124

2225
cmake --build build -j "$NPROC"
2326

24-
cmake --install build
27+
cmake --install build --prefix="$STAGE_EMBEDDED_DIR"
2528

26-
chrpath -d "$STAGE_EMBEDDED_DIR/lib/libswoc"*.so
29+
chrpath -d "$STAGE_EMBEDDED_DIR/lib/libswoc.so"
2730
chrpath -d "$STAGE_EMBEDDED_DIR/lib/libtsapi.so"
2831
chrpath -d "$STAGE_EMBEDDED_DIR/lib/libtscppapi.so"
2932
chrpath -d "$STAGE_EMBEDDED_DIR/lib/libyaml-cpp.so"

0 commit comments

Comments
 (0)