From b9c74117adffe95166d287cd5b75e1d5755fb9c2 Mon Sep 17 00:00:00 2001 From: crouzet Date: Fri, 10 Dec 2021 16:22:24 +0100 Subject: [PATCH] normalisation des logs --- products/compil_scripts/URANIE.sh | 1 + products/compil_scripts/freetype.sh | 3 +-- products/compil_scripts/graphviz-2.38.0.sh | 2 +- products/compil_scripts/med.sh | 2 +- products/compil_scripts/mesa.sh | 4 +++- products/compil_scripts/omniORB.sh | 2 +- products/compil_scripts/opencv.sh | 1 + 7 files changed, 9 insertions(+), 6 deletions(-) diff --git a/products/compil_scripts/URANIE.sh b/products/compil_scripts/URANIE.sh index 6c3979a..bbf720d 100755 --- a/products/compil_scripts/URANIE.sh +++ b/products/compil_scripts/URANIE.sh @@ -15,6 +15,7 @@ rm -rf $BUILD_DIR mkdir -p $BUILD_DIR cd $BUILD_DIR +echo "*** cmake $CMAKE_OPTIONS $SOURCE_DIR" cmake $CMAKE_OPTIONS $SOURCE_DIR if [ $? -ne 0 ] diff --git a/products/compil_scripts/freetype.sh b/products/compil_scripts/freetype.sh index 3d7b73c..271a8c0 100755 --- a/products/compil_scripts/freetype.sh +++ b/products/compil_scripts/freetype.sh @@ -5,8 +5,7 @@ echo "freetype" $VERSION echo "###############################################" echo -echo "*** configure" - +echo "*** configure --prefix=$PRODUCT_INSTALL --with-harfbuzz=no" $SOURCE_DIR/configure --prefix=$PRODUCT_INSTALL --with-harfbuzz=no if [ $? -ne 0 ] diff --git a/products/compil_scripts/graphviz-2.38.0.sh b/products/compil_scripts/graphviz-2.38.0.sh index c5ef6e1..2289126 100755 --- a/products/compil_scripts/graphviz-2.38.0.sh +++ b/products/compil_scripts/graphviz-2.38.0.sh @@ -11,7 +11,7 @@ cp -r $SOURCE_DIR/* . echo "graphviz compilation" echo -echo "*** ./configure --prefix=${PRODUCT_INSTALL} --enable-tcl=no --with-expat=no --with-qt=no --enable-perl=no --enable-ocaml=no" +echo "*** configure --prefix=${PRODUCT_INSTALL} --enable-tcl=no --with-expat=no --with-qt=no --enable-perl=no --enable-ocaml=no" ./configure --prefix=${PRODUCT_INSTALL} --enable-tcl=no --with-expat=no --with-qt=no --enable-perl=no --enable-ocaml=no --with-ghostscript=no --enable-python=no --enable-java=no if [ $? -ne 0 ] diff --git a/products/compil_scripts/med.sh b/products/compil_scripts/med.sh index b5d7f63..886fa7e 100755 --- a/products/compil_scripts/med.sh +++ b/products/compil_scripts/med.sh @@ -41,7 +41,7 @@ else fi echo -echo "*** configure" +echo "*** configure --prefix=$PRODUCT_INSTALL FFLAGS=${FFLAGS} $CONFIGURE_FLAGS" $SOURCE_DIR/configure --prefix=$PRODUCT_INSTALL FFLAGS="${FFLAGS}" $CONFIGURE_FLAGS if [ $? -ne 0 ] then diff --git a/products/compil_scripts/mesa.sh b/products/compil_scripts/mesa.sh index a5668d6..c7a544a 100755 --- a/products/compil_scripts/mesa.sh +++ b/products/compil_scripts/mesa.sh @@ -12,11 +12,11 @@ autoreconf -fi cd $BUILD_DIR echo -echo "*** configure" function version_ge() { test "$(echo "$@" | tr " " "\n" | sort -rV | head -n 1)" == "$1"; } if version_ge $VERSION "19"; then + echo "*** configure --prefix=$PRODUCT_INSTALL --enable-opengl --disable-gles1 --disable-gles2 --disable-va --disable-xvmc --disable-vdpau --enable-shared-glapi --disable-texture-float --enable-llvm --disable-llvm-shared-libs --with-llvm-prefix=$LLVM_ROOT_DIR --with-gallium-drivers=swrast --disable-dri --with-dri-drivers= --disable-egl --with-platforms=x11 --disable-gbm --enable-glx=gallium-xlib --disable-osmesa --enable-gallium-osmesa --enable-autotools" $SOURCE_DIR/configure \ --prefix=$PRODUCT_INSTALL \ --enable-opengl --disable-gles1 --disable-gles2 \ @@ -32,6 +32,7 @@ if version_ge $VERSION "19"; then --disable-osmesa --enable-gallium-osmesa \ --enable-autotools elif version_ge $VERSION "17"; then + "*** configure --prefix=$PRODUCT_INSTALL --enable-opengl --disable-gles1 --disable-gles2 --disable-va --disable-xvmc --disable-vdpau --enable-shared-glapi --disable-texture-float --enable-gallium-llvm --enable-llvm-shared-libs --with-llvm-prefix=$LLVM_ROOT_DIR --with-gallium-drivers=swrast --disable-dri --with-dri-drivers= --disable-egl --with-platforms=x11 --disable-gbm --enable-glx=gallium-xlib --disable-osmesa --enable-gallium-osmesa" $SOURCE_DIR/configure \ --prefix=$PRODUCT_INSTALL \ --enable-opengl --disable-gles1 --disable-gles2 \ @@ -47,6 +48,7 @@ elif version_ge $VERSION "17"; then --disable-osmesa --enable-gallium-osmesa else + "*** configure --prefix=$PRODUCT_INSTALL CXXFLAGS=-O2 -g -DDEFAULT_SOFTWARE_DEPTH_BITS=31 CFLAGS=-O2 -g -DDEFAULT_SOFTWARE_DEPTH_BITS=31 --enable-opengl --disable-gles1 --disable-gles2 --disable-va --disable-xvmc --disable-vdpau --enable-shared-glapi --disable-texture-float --enable-gallium-llvm --enable-llvm-shared-libs --with-llvm-prefix=$LLVM_ROOT_DIR --with-gallium-drivers=swrast,swr --disable-dri --with-dri-drivers= --disable-egl --with-egl-platforms= --disable-gbm --enable-glx=gallium-xlib --disable-osmesa --enable-gallium-osmesa PYTHON2=${PYTHON_ROOT_DIR}/bin/python" $SOURCE_DIR/configure CXXFLAGS="-O2 -g -DDEFAULT_SOFTWARE_DEPTH_BITS=31" \ CFLAGS="-O2 -g -DDEFAULT_SOFTWARE_DEPTH_BITS=31" \ --prefix=$PRODUCT_INSTALL \ diff --git a/products/compil_scripts/omniORB.sh b/products/compil_scripts/omniORB.sh index a9d941f..ff7df41 100755 --- a/products/compil_scripts/omniORB.sh +++ b/products/compil_scripts/omniORB.sh @@ -9,7 +9,7 @@ echo "########################################################################## PYTHON_HOME=$PYTHONHOME echo -echo "*** configure --disable-ipv6" +echo "*** configure --prefix=$PRODUCT_INSTALL --disable-ipv6" $SOURCE_DIR/configure --prefix=$PRODUCT_INSTALL --disable-ipv6 if [ $? -ne 0 ] then diff --git a/products/compil_scripts/opencv.sh b/products/compil_scripts/opencv.sh index eae07ad..c4198f1 100755 --- a/products/compil_scripts/opencv.sh +++ b/products/compil_scripts/opencv.sh @@ -50,6 +50,7 @@ rm -rf $BUILD_DIR mkdir -p $BUILD_DIR cd $BUILD_DIR +echo "*** cmake $CMAKE_OPTIONS $SOURCE_DIR" cmake $CMAKE_OPTIONS $SOURCE_DIR if [ $? -ne 0 ] -- 2.39.2