Skip to content

Commit

Permalink
setup_env.sh: don't invoke cmake twice
Browse files Browse the repository at this point in the history
Makefile.cvs would do it in build/ and then here in ./
Call it once, in build/
  • Loading branch information
mvidner committed Sep 23, 2024
1 parent 07f3a45 commit 581537b
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions rust/libzypp/setup_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,18 @@ git submodule init
git submodule update --checkout

# lets build libzypp
(
cd libzypp
make -f Makefile.cvs
cmake -D BUILD_GLIB_API=ON -D DISABLE_AUTODOCS=ON
mkdir -p build
cd build
# With /usr/local, we have to set a path: LD_LIBRARY_PATH=/usr/local/lib64 zypprs
# but the plus side is that the /usr zypper keeps working :)
#
# cmake -D CMAKE_INSTALL_PREFIX=/usr/local -D BUILD_GLIB_API=ON -D DISABLE_AUTODOCS=ON ..
cmake -D BUILD_GLIB_API=ON -D DISABLE_AUTODOCS=ON ..
make -j$(nproc)
$SUDO make install
cd -
)

# now lets make rust working
rustup install stable
Expand Down

0 comments on commit 581537b

Please sign in to comment.