[vlc-commits] zlib: enable PIC on Solaris

[Sean McGovern]

vlc/vlc-2.2 | branch: master | Sean McGovern <gseanmcg at gmail.com> | Mon Jun 23 21:08:16 2014 -0400| [8ea2a889a4199bba8438fb45659d3e77453c7394] | committer: Jean-Baptiste Kempf

zlib: enable PIC on Solaris

Signed-off-by: Rafaël Carré <funman at videolan.org>
(cherry picked from commit 8f70026dbf9a1f673da6a5ddff8b6d2fdbc2d4f7)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=8ea2a889a4199bba8438fb45659d3e77453c7394
---

 contrib/src/zlib/rules.mak |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/contrib/src/zlib/rules.mak b/contrib/src/zlib/rules.mak
index b198aee..d5f1e9e 100644
--- a/contrib/src/zlib/rules.mak
+++ b/contrib/src/zlib/rules.mak
@@ -13,6 +13,10 @@ ZLIB_CONFIG_VARS=CHOST=$(HOST)
 endif
 endif
 
+ifdef HAVE_SOLARIS
+ZLIB_ECFLAGS = -fPIC -DPIC
+endif
+
 $(TARBALLS)/zlib-$(ZLIB_VERSION).tar.gz:
 	$(call download,$(ZLIB_URL))
 
@@ -23,6 +27,6 @@ zlib: zlib-$(ZLIB_VERSION).tar.gz .sum-zlib
 	$(MOVE)
 
 .zlib: zlib
-	cd $< && $(HOSTVARS) $(ZLIB_CONFIG_VARS) ./configure --prefix=$(PREFIX) --static
+	cd $< && $(HOSTVARS) $(ZLIB_CONFIG_VARS) CFLAGS="$(CFLAGS) $(ZLIB_ECFLAGS)" ./configure --prefix=$(PREFIX) --static
 	cd $< && $(MAKE) install
 	touch $@