33 lines
1.1 KiB
Plaintext
33 lines
1.1 KiB
Plaintext
$OpenBSD: patch-giscanner_utils_py,v 1.5 2013/03/28 19:32:11 jasper Exp $
|
|
|
|
Make sure try to compile/link with the right libtool,
|
|
this overrides the --libtool option to girscanner.
|
|
|
|
--- giscanner/utils.py.orig Tue Mar 26 17:10:17 2013
|
|
+++ giscanner/utils.py Tue Mar 26 17:11:12 2013
|
|
@@ -110,22 +110,8 @@ def get_libtool_command(options):
|
|
if not libtool_infection:
|
|
return None
|
|
|
|
- libtool_path = options.libtool_path
|
|
- if libtool_path:
|
|
- # Automake by default sets:
|
|
- # LIBTOOL = $(SHELL) $(top_builddir)/libtool
|
|
- # To be strictly correct we would have to parse shell. For now
|
|
- # we simply split().
|
|
- return libtool_path.split(' ')
|
|
-
|
|
- try:
|
|
- subprocess.check_call(['libtool', '--version'],
|
|
- stdout=open(os.devnull))
|
|
- except (subprocess.CalledProcessError, OSError):
|
|
- # If libtool's not installed, assume we don't need it
|
|
- return None
|
|
-
|
|
- return ['libtool']
|
|
+ libtool_cmd = os.environ.get('LIBTOOL', '/usr/bin/libtool')
|
|
+ return libtool_cmd.split()
|
|
|
|
|
|
def files_are_identical(path1, path2):
|