components/hplip/patches/09_nonGNUlibc.patch
branchs11u3-sru
changeset 5296 fe5e30c5a9ac
parent 3935 177c89f1f2cf
--- a/components/hplip/patches/09_nonGNUlibc.patch	Tue Jan 19 14:07:25 2016 -0800
+++ b/components/hplip/patches/09_nonGNUlibc.patch	Wed Jan 13 06:39:34 2016 -0800
@@ -1,14 +1,17 @@
-Home brewed patch
+source: in-house
+Do not crash on "non-GNU system" (no GNU libc).
 
---- a/installer/dcheck.py	2014-06-02 23:31:24.000000000 -0700
-+++ hplip-3.14.6/installer/dcheck.py	2014-07-01 14:58:22.329268435 -0700
-@@ -365,8 +365,11 @@
-             LIBC = ctypes.CDLL(ctypes.util.find_library('c'),ctypes.DEFAULT_MODE,None, True)
-         except:
-             LIBC = ctypes.CDLL(ctypes.util.find_library('c'),ctypes.DEFAULT_MODE,None) #python2.4 and below syntax
+--- a/installer/dcheck.py	2015-08-26 04:52:23.900974542 -0700
++++ b/installer/dcheck.py	2015-08-26 04:56:35.111537299 -0700
+@@ -365,9 +365,12 @@
+         return '-'
+     else:
+ #        LIBC = ctypes.CDLL(ctypes.util.find_library('c'), use_errno=True)
+-        LIBC = ctypes.CDLL(ctypes.util.find_library('c'),ctypes.DEFAULT_MODE,None, True)
 -        LIBC.gnu_get_libc_version.restype = ctypes.c_char_p
 -        return LIBC.gnu_get_libc_version()
 +        try:
++            LIBC = ctypes.CDLL(ctypes.util.find_library('c'),ctypes.DEFAULT_MODE,None, True)
 +            LIBC.gnu_get_libc_version.restype = ctypes.c_char_p
 +            return LIBC.gnu_get_libc_version()
 +        except: