From 211eda91437c439c0a0037baf33a0869e873a20c Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 18 Apr 2013 15:09:31 +0000 Subject: [PATCH] Fix pb with improper la files modification --- config_files/ftgl.sh | 2 +- config_files/med.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config_files/ftgl.sh b/config_files/ftgl.sh index 979a82b..30d11c8 100755 --- a/config_files/ftgl.sh +++ b/config_files/ftgl.sh @@ -129,7 +129,7 @@ check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR} if [ -f ${PRODUCT_DIR}/lib/libftgl.la ] ; then cd ${PRODUCT_DIR}/lib sed -i "s%\(.*\)\([[:space:]].*libfreetype.la\)\(.*\)%\1 -lfreetype\3%g;s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" libftgl.la - sed -i "s%\(.*\)\([[:space:]].*-L.*/freetype-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${FREETYPEDIR}/lib \3%g" libftgl.la + sed -i "s%\(.*\)\([[:space:]].*-L.*/freetype-[0-9]\+\.[0-9]\+\.[0-9]\+/lib[[:space:]]\)\(.*\)%\1 -L${FREETYPEDIR}/lib \3%g" libftgl.la fi # modify pkgconfig diff --git a/config_files/med.sh b/config_files/med.sh index 45f3761..02f8b20 100755 --- a/config_files/med.sh +++ b/config_files/med.sh @@ -135,7 +135,7 @@ if [ -n "${HDF5HOME}" ]; then fi for fl in libmed.la libmedC.la libmedimport.la ; do sed -i "s%\(.*\)\([[:space:]].*libhdf5.la\)\(.*\)%\1 -lhdf5\3%g;s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" ${fl} - sed -i "s%\(.*\)\([[:space:]].*-L.*/hdf5-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" ${fl} + sed -i "s%\(.*\)\([[:space:]].*-L.*/hdf5-[0-9]\+\.[0-9]\+\.[0-9]\+/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" ${fl} sed -i "s%\(.*\)\([[:space:]].*-L../../src/\)\(.*\)%\1\3%g;s%\(.*\)\([[:space:]].*libmed.la\)\(.*\)%\1 ${PRODUCT_DIR}/lib/libmed.la \3%g" ${fl} done -- 2.39.2