Skip to content

Commit e6d3759

Browse files
Fix Tarball build for Python plugin
1 parent e941d55 commit e6d3759

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

.gitlab/build-codecompass.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ export LDFLAGS="-Wl,-rpath-link,$DEPS_INSTALL_RUNTIME_DIR/openssl-install/lib "\
4444
# otherwise version in postgresql-install/lib is used
4545

4646
export LD_LIBRARY_PATH=$DEPS_INSTALL_RUNTIME_DIR/odb-install/lib\
47+
:$DEPS_INSTALL_RUNTIME_DIR/python-install/lib\
4748
:$LD_LIBRARY_PATH
4849

4950
export CMAKE_PREFIX_PATH=$DEPS_INSTALL_RUNTIME_DIR/libgit2-install\

.gitlab/build-deps.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,11 +238,13 @@ export LD_LIBRARY_PATH=$DEPS_INSTALL_RUNTIME_DIR/openssl-install/lib:$LD_LIBRARY
238238
--quiet \
239239
--prefix=$DEPS_INSTALL_RUNTIME_DIR/python-install \
240240
--with-openssl=$DEPS_INSTALL_RUNTIME_DIR/openssl-install \
241-
--enable-optimizations
241+
--enable-optimizations \
242+
--enable-shared
242243
make install --quiet --jobs $(nproc)
243244
rm -f $PACKAGES_DIR/Python-3.9.0.tar.xz
244245

245246
export PATH=$DEPS_INSTALL_RUNTIME_DIR/python-install/bin:$PATH
247+
export LD_LIBRARY_PATH="$DEPS_INSTALL_RUNTIME_DIR/python-install/lib:$LD_LIBRARY_PATH"
246248

247249
##############
248250
# LLVM/Clang #
@@ -311,7 +313,7 @@ if [ ! -f $DEPS_INSTALL_RUNTIME_DIR/boost-install/lib/libboost_program_options.s
311313

312314
./bootstrap.sh \
313315
--prefix=$DEPS_INSTALL_RUNTIME_DIR/boost-install \
314-
--with-python=$DEPS_INSTALL_RUNTIME_DIR/python-install/bin/python
316+
--with-python=$DEPS_INSTALL_RUNTIME_DIR/python-install/bin/python3
315317
./b2 -j $(nproc) install
316318

317319
rm -f $PACKAGES_DIR/boost_1_74_0.tar.gz

0 commit comments

Comments
 (0)