From cfa15275ae5a36360b0f9cc9f7e4bbba363381af Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 3 Dec 2012 08:06:07 +0000 Subject: [PATCH] Correct path to the libGL in ALL *.la files (not libTKOpenGl.la only) --- config_files/OCCT.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/config_files/OCCT.sh b/config_files/OCCT.sh index 9022916..73ac34a 100755 --- a/config_files/OCCT.sh +++ b/config_files/OCCT.sh @@ -179,11 +179,16 @@ if [ "$gllibdir" != "" ] ; then str_to_replace="-L${gllibdir} -lGL" fi - sed -e "s%-lGL\b%%g" \ - -e "s%[^[:space:]]*libGL.la[[:space:]]%%g" \ - -e "s%^dependency_libs='\(.*\)%dependency_libs='${str_to_replace} \1%" \ - libTKOpenGl.la > libTKOpenGl.la.new - mv -f libTKOpenGl.la.new libTKOpenGl.la + la_files=`find . -name "*.la"` + for la_file in ${la_files} XXX ; do + if [ "${la_file}" = "XXX" ] ; then continue; fi + grep -e "libGL.la" ${la_file} >& /dev/null || grep -e "-lGL\b" ${la_file} >& /dev/null && + sed -e "s%-lGL\b%%g" \ + -e "s%[^[:space:]']*libGL.la[[:space:]]%%g" \ + -e "s%^dependency_libs='\(.*\)%dependency_libs='${str_to_replace} \1%" \ + ${la_file} > ${la_file}.new && + mv -f ${la_file}.new ${la_file} + done fi #du -sk ${PRODUCT_SRC_DIR} > ${PRODUCT_DIR}/size.log -- 2.39.2