From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Tue, 28 Oct 2014 03:09:02 +0000 (-0600)
Subject: Add missing zlib.exp file and common LT_LDFLAGS Makefile.in.
X-Git-Tag: SUDO_1_8_12^2~103
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=67c7c7f9dd8829ef859eacfed9b7dbc14805012a;p=sudo

Add missing zlib.exp file and common LT_LDFLAGS Makefile.in.
---

diff --git a/lib/zlib/Makefile.in b/lib/zlib/Makefile.in
index e5d889baa..ca3e01d20 100644
--- a/lib/zlib/Makefile.in
+++ b/lib/zlib/Makefile.in
@@ -37,13 +37,14 @@ localstatedir = @localstatedir@
 # File extension, mode and map file to use for shared libraries/objects
 shlib_enable = @SHLIB_ENABLE@
 shlib_mode = @SHLIB_MODE@
-shlib_exp = ./zlib.exp
+shlib_exp = zlib.exp
 shlib_map = zlib.map
 shlib_opt = zlib.opt
 
 # Compiler & tools to use
 CC = @CC@
 LIBTOOL = @LIBTOOL@
+SED = @SED@
 AWK = @AWK@
 
 # Our install program supports extra flags...
@@ -57,8 +58,8 @@ CPPFLAGS = -I. -I$(srcdir)
 CFLAGS = @CFLAGS@
 
 # Flags to pass to the link stage
-LT_LDFLAGS = @ZLIB_LDFLAGS@
 LDFLAGS =
+LT_LDFLAGS = @ZLIB_LDFLAGS@ @LT_LDFLAGS@ @LT_LDEXPORTS@
 
 # PIE flags
 PIE_CFLAGS = @PIE_CFLAGS@
@@ -102,7 +103,7 @@ $(shlib_map): $(shlib_exp)
 $(shlib_opt): $(shlib_exp)
 	@$(SED) 's/^/+e /' $(shlib_exp) > $@
 
-libsudo_z.la: $(LTOBJS)
+libsudo_z.la: $(LTOBJS) @LT_LDDEP@
 	case "$(LT_LDFLAGS)" in \
 	*-no-install*) \
 	    $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(LT_LDFLAGS) $(LTOBJS);; \
diff --git a/lib/zlib/zlib.exp b/lib/zlib/zlib.exp
new file mode 100644
index 000000000..8fba721fd
--- /dev/null
+++ b/lib/zlib/zlib.exp
@@ -0,0 +1,78 @@
+adler32
+adler32_combine
+adler32_combine64
+compress
+compress2
+compressBound
+crc32
+crc32_combine
+crc32_combine64
+deflate
+deflateBound
+deflateCopy
+deflateEnd
+deflateInit2_
+deflateInit_
+deflateParams
+deflatePending
+deflatePrime
+deflateReset
+deflateResetKeep
+deflateSetDictionary
+deflateSetHeader
+deflateTune
+get_crc_table
+gzbuffer
+gzclearerr
+gzclose
+gzclose_r
+gzclose_w
+gzdirect
+gzdopen
+gzeof
+gzerror
+gzflush
+gzgetc
+gzgetc_
+gzgets
+gzoffset
+gzoffset64
+gzopen
+gzopen64
+gzopen_w
+gzprintf
+gzputc
+gzputs
+gzread
+gzrewind
+gzseek
+gzseek64
+gzsetparams
+gztell
+gztell64
+gzungetc
+gzvprintf
+gzwrite
+inflate
+inflateBack
+inflateBackEnd
+inflateBackInit_
+inflateCopy
+inflateEnd
+inflateGetDictionary
+inflateGetHeader
+inflateInit2_
+inflateInit_
+inflateMark
+inflatePrime
+inflateReset
+inflateReset2
+inflateResetKeep
+inflateSetDictionary
+inflateSync
+inflateSyncPoint
+inflateUndermine
+uncompress
+zError
+zlibCompileFlags
+zlibVersion