From 17b1d24de07a20cace32f76b558135ab7969f022 Mon Sep 17 00:00:00 2001
From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi.denis-courmont@nokia.com>
Date: Mon, 8 Aug 2011 18:31:10 +0300
Subject: [PATCH] contrib: add HOSTVARS_PIC to force PIC build (for CMake)

---
 contrib/src/main.mak | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 3012420c2b..974cbf1f2b 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -147,19 +147,6 @@ endif
 #
 # Common helpers
 #
-HOSTVARS := CPPFLAGS="$(CPPFLAGS)"
-HOSTVARS += CC="$(CC)"
-HOSTVARS += CFLAGS="$(CFLAGS)"
-HOSTVARS += CXX="$(CXX)"
-HOSTVARS += CXXFLAGS="$(CXXFLAGS)"
-HOSTVARS += LD="$(LD)"
-HOSTVARS += LDFLAGS="$(LDFLAGS)"
-HOSTVARS += AR="$(AR)"
-HOSTVARS += RANLIB="$(RANLIB)"
-HOSTVARS += STRIP="$(STRIP)"
-HOSTVARS += PATH="$(PREFIX)/bin:$(PATH)"
-HOSTVARS_AR += AR="$(AR) rcvu"
-
 HOSTCONF := --prefix="$(PREFIX)"
 HOSTCONF += --build="$(BUILD)" --host="$(HOST)" --target="$(HOST)"
 HOSTCONF += --program-prefix=""
@@ -167,10 +154,27 @@ HOSTCONF += --program-prefix=""
 HOSTCONF += --enable-static --disable-shared --disable-dependency-tracking
 ifdef HAVE_WIN32
 HOSTCONF += --without-pic
+PIC :=
 else
 HOSTCONF += --with-pic
+PIC := -fPIC
 endif
 
+HOSTTOOLS := \
+	CC="$(CC)" CXX="$(CXX)" LD="$(LD)" \
+	AR="$(AR)" RANLIB="$(RANLIB)" STRIP="$(STRIP)" \
+	PATH="$(PREFIX)/bin:$(PATH)"
+HOSTVARS := $(HOSTTOOLS) \
+	CPPFLAGS="$(CPPFLAGS)" \
+	CFLAGS="$(CFLAGS)" \
+	CXXFLAGS="$(CXXFLAGS)" \
+	LDFLAGS="$(LDFLAGS)"
+HOSTVARS_PIC := $(HOSTTOOLS) \
+	CPPFLAGS="$(CPPFLAGS) $(PIC)" \
+	CFLAGS="$(CFLAGS) $(PIC)" \
+	CXXFLAGS="$(CXXFLAGS) $(PIC)" \
+	LDFLAGS="$(LDFLAGS)"
+
 download_git = \
 	rm -Rf $(@:.tar.xz=) && \
 	$(GIT) clone $(2:%=--branch %) $(1) $(@:.tar.xz=) && \
-- 
2.39.2