summaryrefslogtreecommitdiff
path: root/onbld/debian/patches/libctf-dlopen-libz.patch
blob: bbaabff1dcd5f0b866b1becb0481ebf9f0b8770b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
Index: b/usr/src/lib/libctf/common/ctf_lib.c
===================================================================
--- a/usr/src/lib/libctf/common/ctf_lib.c	2014-03-02 01:31:14.561780465 +0400
+++ b/usr/src/lib/libctf/common/ctf_lib.c	2014-03-02 01:32:50.581071938 +0400
@@ -34,11 +34,7 @@
 #include <dlfcn.h>
 #include <gelf.h>
 
-#ifdef _LP64
-static const char *_libctf_zlib = "/usr/lib/64/libz.so.1";
-#else
-static const char *_libctf_zlib = "/usr/lib/libz.so.1";
-#endif
+static const char *_libctf_zlib = "libz.so.1";
 
 static struct {
 	int (*z_uncompress)(uchar_t *, ulong_t *, const uchar_t *, ulong_t);
@@ -77,9 +73,6 @@
 	if (zlib.z_dlp != NULL)
 		return (zlib.z_dlp); /* library is already loaded */
 
-	if (access(_libctf_zlib, R_OK) == -1)
-		return (ctf_set_open_errno(errp, ECTF_ZMISSING));
-
 	if ((zlib.z_dlp = dlopen(_libctf_zlib, RTLD_LAZY | RTLD_LOCAL)) == NULL)
 		return (ctf_set_open_errno(errp, ECTF_ZINIT));