From: Nabil Ghodbane Date: Tue, 5 Nov 2024 08:30:51 +0000 (+0100) Subject: Remove hack_libtool as discussed in: https://github.com/SalomePlatform/.github/issues/8 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=25502c183c73bdef86af65d79a87fd1180335e3a;p=tools%2Fsat.git Remove hack_libtool as discussed in: https://github.com/SalomePlatform/.github/issues/8 --- diff --git a/src/compilation.py b/src/compilation.py index 3a49a70..4e4311b 100644 --- a/src/compilation.py +++ b/src/compilation.py @@ -237,36 +237,6 @@ class Builder: else: return 1 - def hack_libtool(self): - if not os.path.exists(str(self.build_dir + 'libtool')): - return - - lf = open(os.path.join(str(self.build_dir), "libtool"), 'r') - for line in lf.readlines(): - if 'hack_libtool' in line: - return - - # fix libtool by replacing CC="" with hack_libtool function - hack_command='''sed -i "s%^CC=\\"\(.*\)\\"%hack_libtool() { \\n\\ -if test \\"\$(echo \$@ | grep -E '\\\\\\-L/usr/lib(/../lib)?(64)? ')\\" == \\\"\\\" \\n\\ - then\\n\\ - cmd=\\"\\1 \$@\\"\\n\\ - else\\n\\ - cmd=\\"\\1 \\"\`echo \$@ | sed -r -e 's|(.*)-L/usr/lib(/../lib)?(64)? (.*)|\\\\\\1\\\\\\4 -L/usr/lib\\\\\\3|g'\`\\n\\ - fi\\n\\ - \$cmd\\n\\ -}\\n\\ -CC=\\"hack_libtool\\"%g" libtool''' - - self.log_command(hack_command) - subprocess.call(hack_command, - shell=True, - cwd=str(self.build_dir), - env=self.build_environ.environ.environ, - stdout=self.logger.logTxtFile, - stderr=subprocess.STDOUT) - - ## # Runs make to build the module. def make(self, nb_proc, make_opt=""):