diff options
| -rwxr-xr-x | build-bootstrap.sh | 17 | ||||
| -rwxr-xr-x | build-chroot.sh | 17 |
2 files changed, 17 insertions, 17 deletions
diff --git a/build-bootstrap.sh b/build-bootstrap.sh index 8deb454..d18a06e 100755 --- a/build-bootstrap.sh +++ b/build-bootstrap.sh @@ -280,23 +280,6 @@ make -j $THREAD make -j $THREAD install DESTDIR=$MAPLE cd .. -# CMake Build -tar xf ../sources/cmake-*.tar* -cd cmake-*/ -# NOTE: Tests are disabled because they attempt to run on the system responsible -# for the build, not the system being built. ~ahill -cmake -B build -G Ninja \ - -DBUILD_TESTING=OFF \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_COMPILER=$CC \ - -DCMAKE_CXX_COMPILER=$CXX \ - -DCMAKE_INSTALL_PREFIX=$MAPLE/usr \ - -DCMAKE_SYSROOT=$MAPLE \ - -DCMAKE_USE_OPENSSL=OFF -cmake --build build -cmake --install build -cd .. - # Gawk Build tar xf ../sources/gawk-*.tar* cd gawk-*/ diff --git a/build-chroot.sh b/build-chroot.sh index 247c008..4a8aac9 100755 --- a/build-chroot.sh +++ b/build-chroot.sh @@ -135,6 +135,23 @@ make -j $THREADS make -j $THREADS install cd .. +# CMake Build +tar xf ../sources/cmake-*.tar* +cd cmake-*/ +./bootstrap \ + --bindir=/bin \ + --parallel=$THREADS \ + --prefix=/usr \ + --system-bzip2 \ + --system-curl \ + --system-expat \ + --system-libarchive \ + --system-liblzma \ + --system-zlib +make -j $THREADS +make -j $THREADS install +cd .. + # Samurai Build tar xf ../sources/samurai-*.tar* cd samurai-*/ |