diff options
Diffstat (limited to 'print/hplip/patches/patch-installer_dcheck.py')
| -rw-r--r-- | print/hplip/patches/patch-installer_dcheck.py | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/print/hplip/patches/patch-installer_dcheck.py b/print/hplip/patches/patch-installer_dcheck.py index 107499f67dd..3422ca17244 100644 --- a/print/hplip/patches/patch-installer_dcheck.py +++ b/print/hplip/patches/patch-installer_dcheck.py @@ -1,29 +1,18 @@ -$NetBSD: patch-installer_dcheck.py,v 1.4 2020/01/04 04:24:12 khorben Exp $ +$NetBSD: patch-installer_dcheck.py,v 1.5 2022/03/13 05:46:55 gutteridge Exp $ Locate libraries on systems without ldconfig(8) -This only looks for libraries in pkgsrc's own library folder. +This only looks for libraries in pkgsrc's own library folder, after the +subst framework in Makefile operates. --- installer/dcheck.py.orig 2019-12-10 05:00:31.000000000 +0000 +++ installer/dcheck.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/pkg/bin/python3.7 - # -*- coding: utf-8 -*- - # - # (c) Copyright 2003-2015 HP Development Company, L.P. -@@ -99,11 +99,13 @@ def check_lib(lib, min_ver=0): +@@ -99,6 +99,8 @@ def check_lib(lib, min_ver=0): # pass #else: return True -+ elif check_file(lib+".so","/usr/pkg/lib"): ++ elif check_file(lib+".so","/usr/lib"): + return True else: log.debug("Not found.") return False - --def check_file(f, dir="/usr/include"): -+def check_file(f, dir="/usr/pkg/include"): - log.debug("Searching for file '%s' in '%s'..." % (f, dir)) - for w in utils.walkFiles(dir, recurse=True, abs_paths=True, return_folders=False, pattern=f): - log.debug("File found at '%s'" % w) |