From: Henning Heinold <heinold@inf.fu-berlin.de>
Date: Fri, 25 Feb 2011 14:48:44 +0000 (+0100)
Subject: freetpye: fix the manual call of libtool by freetype
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdf563b360dc1e1e3a289492087fafb4616deb9a;p=openembedded.git

freetpye: fix the manual call of libtool by freetype

* remove unessary and not used patches
* add rpath-link to the LDFLAGS, prevents libtool using relink at
  make install
* bump PR
---

diff --git a/recipes/freetype/freetype-2.4.3/fix-configure.patch b/recipes/freetype/freetype-2.4.3/fix-configure.patch
deleted file mode 100644
index ecd96738d4..0000000000
--- a/recipes/freetype/freetype-2.4.3/fix-configure.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: freetype-2.3.6/builds/unix/configure.ac
-===================================================================
---- freetype-2.3.6.orig/builds/unix/configure.ac
-+++ freetype-2.3.6/builds/unix/configure.ac
-@@ -506,8 +506,6 @@ AC_SUBST([FT2_EXTRA_LIBS])
- AC_SUBST([SYSTEM_ZLIB])
- 
- 
--LT_INIT(win32-dll)
--
- AC_SUBST([hardcode_libdir_flag_spec])
- AC_SUBST([wl])
- AC_SUBST([build_libtool_libs])
diff --git a/recipes/freetype/freetype/configure.patch b/recipes/freetype/freetype/configure.patch
deleted file mode 100644
index f11cf96be0..0000000000
--- a/recipes/freetype/freetype/configure.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
-Index: freetype-2.1.8/builds/unix/configure.ac
-===================================================================
---- freetype-2.1.8.orig/builds/unix/configure.ac	2004-04-14 04:49:11.000000000 -0400
-+++ freetype-2.1.8/builds/unix/configure.ac	2005-03-12 03:14:23.000000000 -0500
-@@ -111,8 +111,8 @@
- # Check for system zlib
- 
- AC_ARG_WITH([zlib],
--  dnl don't quote AS_HELP_STRING!
--  AS_HELP_STRING([--without-zlib],
-+  dnl don't quote AC_HELP_STRING!
-+  AC_HELP_STRING([--without-zlib],
-                  [use internal zlib instead of system-wide]))
- if test x$with_zlib != xno && test -z "$LIBZ"; then
-   AC_CHECK_LIB([z], [gzsetparams], [AC_CHECK_HEADER([zlib.h], [LIBZ='-lz'])])
-@@ -127,7 +127,7 @@
- # Whether to use Mac OS resource-based fonts or not
- 
- AC_ARG_WITH([old-mac-fonts],
--  dnl don't quote AS_HELP_STRING!
--  AS_HELP_STRING([--with-old-mac-fonts],
-+  dnl don't quote AC_HELP_STRING!
-+  AC_HELP_STRING([--with-old-mac-fonts],
-                  [allow Mac resource-based fonts to be used]))
- if test x$with_old_mac_fonts = xyes; then
-Index: freetype-2.1.8/builds/unix/unix-cc.in
-===================================================================
---- freetype-2.1.8.orig/builds/unix/unix-cc.in	2003-11-09 03:37:13.000000000 -0500
-+++ freetype-2.1.8/builds/unix/unix-cc.in	2005-03-12 18:37:24.613693760 -0500
-@@ -14,9 +14,11 @@
- 
- CC           := @CC@
- COMPILER_SEP := $(SEP)
-+SHELL        := @SHELL@
-+top_builddir := $(BUILD_DIR)
- 
- ifndef LIBTOOL
--  LIBTOOL := $(BUILD_DIR)/libtool
-+  LIBTOOL := @LIBTOOL@
- endif
- 
- 
diff --git a/recipes/freetype/freetype_2.4.3.bb b/recipes/freetype/freetype_2.4.3.bb
index 90a0fe8c49..66d2e51fe2 100644
--- a/recipes/freetype/freetype_2.4.3.bb
+++ b/recipes/freetype/freetype_2.4.3.bb
@@ -1,13 +1,12 @@
 DESCRIPTION = "Freetype font rendering library"
 SECTION = "libs"
 LICENSE = "freetype GPLv2"
-PR = "r0"
+PR = "r1"
 DEPENDS = "zlib"
 
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
   file://no-hardcode.patch \
-  file://fix-configure.patch \
   file://libtool-tag.patch \
 "
 S = "${WORKDIR}/freetype-${PV}"
@@ -17,14 +16,16 @@ SRC_URI[sha256sum] = "b4e626db62fd1b4549ff5d57f5eca3a41631fd6066adf8a31c11879b51
 
 inherit autotools pkgconfig binconfig
 
-LIBTOOL = "${HOST_SYS}-libtool"
+LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool"
 EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
 
+LDFLAGS_append = " -Wl,-rpath-link -Wl,${STAGING_DIR_TARGET}${libdir}"
+
 do_configure() {
 	cd builds/unix
-	libtoolize --force --copy
 	gnu-configize --force
 	aclocal -I .
+	libtoolize --force --copy
 	autoconf
 	cd ${S}
 	oe_runconf