From 028eb10ee27ab70c8607b90ef0dd826401d2b1a0 Mon Sep 17 00:00:00 2001
From: Abdoulaye Walsimou Gaye <walsimou@walsimou.com>
Date: Mon, 5 Apr 2010 23:34:14 +0200
Subject: packages: freetype: use internal libtool

Signed-off-by: Abdoulaye Walsimou Gaye <walsimou@walsimou.com>
---
 packages/graphics/freetype/freetype.mk | 47 +++++++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 15 deletions(-)

diff --git a/packages/graphics/freetype/freetype.mk b/packages/graphics/freetype/freetype.mk
index a9d67cb..bf2f1f0 100644
--- a/packages/graphics/freetype/freetype.mk
+++ b/packages/graphics/freetype/freetype.mk
@@ -1,19 +1,20 @@
 ################################################################################
 # GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
-# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved.
+# Copyright(C) 2009-2010 GAYE Abdoulaye Walsimou. All rights reserved.
 #
-# This program is free software; you can distribute it and/or modify it
-# under the terms of the GNU General Public License
-# (Version 2 or later) published by the Free Software Foundation.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# This program is distributed in the hope it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
 ################################################################################
 #
 # \file         freetype.mk
@@ -40,8 +41,11 @@ $(FREETYPE_BUILD_DIR)/.installed: zlib_target_install download_freetype \
 	$(call EMBTK_GENERIC_MESSAGE,"Compiling and installing \
 	freetype-$(FREETYPE_VERSION) in your root filesystem...")
 	$(call EMBTK_KILL_LT_RPATH, $(FREETYPE_BUILD_DIR))
-	$(Q)$(MAKE) -C $(FREETYPE_BUILD_DIR) $(J)
-	$(Q)$(MAKE) -C $(FREETYPE_BUILD_DIR) DESTDIR=$(SYSROOT) install
+	$(Q)$(MAKE) -C $(FREETYPE_BUILD_DIR) $(J) \
+	LIBTOOL=$(FREETYPE_BUILD_DIR)/builds/unix/libtool
+	$(Q)$(MAKE) -C $(FREETYPE_BUILD_DIR) \
+	LIBTOOL=$(FREETYPE_BUILD_DIR)/builds/unix/libtool \
+	DESTDIR=$(SYSROOT) install
 	$(Q)$(MAKE) libtool_files_adapt
 	$(Q)$(MAKE) pkgconfig_files_adapt
 	$(Q)$(MAKE) $(FREETYPE_BUILD_DIR)/.freetype-configpatched
@@ -61,9 +65,22 @@ $(FREETYPE_BUILD_DIR)/.decompressed:
 
 $(FREETYPE_BUILD_DIR)/.configured:
 	$(Q)cd $(FREETYPE_BUILD_DIR); \
-	CC=$(TARGETCC_CACHED) CFLAGS="$(TARGET_CFLAGS)" \
+	CC=$(TARGETCC_CACHED) \
+	CXX=$(TARGETCXX_CACHED) \
+	AR=$(TARGETAR) \
+	RANLIB=$(TARGETRANLIB) \
+	AS=$(CROSS_COMPILE)as \
+	LD=$(TARGETLD) \
+	NM=$(TARGETNM) \
+	STRIP=$(TARGETSTRIP) \
+	OBJDUMP=$(TARGETOBJDUMP) \
+	OBJCOPY=$(TARGETOBJCOPY) \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	CXXFLAGS="$(TARGET_CFLAGS)" \
+	LDFLAGS="-L$(SYSROOT)/$(LIBDIR) -L$(SYSROOT)/usr/$(LIBDIR)" \
+	CPPFLGAS="-I$(SYSROOT)/usr/include" \
 	./configure --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \
-	--prefix=/usr --enable-static=no --disable-rpath --libdir=/usr/$(LIBDIR)
+	--prefix=/usr --enable-static=no --libdir=/usr/$(LIBDIR)
 	@touch $@
 
 $(FREETYPE_BUILD_DIR)/.freetype-configpatched:
-- 
cgit v1.2.3