From 7669adeb8e4dfc36b3c4478e9f21c32b3199cd20 Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 16 Apr 2013 15:23:47 +0000 Subject: [PATCH] Minor changes --- config_files/graphviz.sh | 7 +++++-- config_files/scotch.sh | 5 ++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/config_files/graphviz.sh b/config_files/graphviz.sh index 5aa0759..d640428 100755 --- a/config_files/graphviz.sh +++ b/config_files/graphviz.sh @@ -85,8 +85,11 @@ install_source cd ${PRODUCT_SRC_DIR} test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR} -sed -i 's%PYTHON_LIBS="\(.*\)"%PYTHON_LIBS="-L\$PYTHON_PREFIX/lib \1"%g' configure -sed -i "s%echo 'puts \[info tclversion\]' | \$TCLSH%echo 'puts \[info tclversion\]' | \$TCLSH 2>/dev/null | grep -E '^[0-9.]+$'%g" configure +local patch_build_procedure=1 +if [ "${patch_build_procedure}" = "1" ] ; then + sed -i 's%PYTHON_LIBS="\(.*\)"%PYTHON_LIBS="-L\$PYTHON_PREFIX/lib \1"%g' configure + sed -i "s%echo 'puts \[info tclversion\]' | \$TCLSH%echo 'puts \[info tclversion\]' | \$TCLSH 2>/dev/null | grep -E '^[0-9.]+$'%g" configure +fi CONFIGURE_FLAGS="--disable-rpath -without-qt" if [ "${EXPAT_ROOT}" != "" ] ; then diff --git a/config_files/scotch.sh b/config_files/scotch.sh index bad3e03..a9ec81c 100755 --- a/config_files/scotch.sh +++ b/config_files/scotch.sh @@ -83,9 +83,8 @@ fi local patch_pthread=1 if [ "${patch_pthread}" = "1" ] ; then - echo -n ".. Patching scotch sources: fix pb with linking to pthread..." && \ - cd ${PRODUCT_SRC_DIR}/src && \ - sed -i "s%^\(LDFLAGS.*\)%\1 -lpthread%g" Makefile.inc + cd ${PRODUCT_SRC_DIR}/src + sed -i "s%^\(LDFLAGS.*\)%\1 -lpthread%g" $(readlink Makefile.inc) fi # make -- 2.39.2