aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Samuelsson <ulf_samuelsson@telia.com>2011-11-16 15:18:56 +0100
committerUlf Samuelsson <ulf_samuelsson@telia.com>2011-11-21 16:50:39 +0100
commit7c08b324001addb86f704e6fdd2db4f07934801a (patch)
tree9deda6cf499dd63dec98f5f18f7818dcfea0bee4
parentce0b25d89bef08bfdaef906fc58d1eef6d886100 (diff)
downloadopenembedded-7c08b324001addb86f704e6fdd2db4f07934801a.zip
openembedded-7c08b324001addb86f704e6fdd2db4f07934801a.tar.gz
openembedded-7c08b324001addb86f704e6fdd2db4f07934801a.tar.bz2
freetype: don't hardcode libdir
Signed-off-by: Ulf Samuelsson <ulf.samuelsson@telia.com>
-rw-r--r--recipes/freetype/freetype-2.4.4/no-hardcode.patch11
-rw-r--r--recipes/freetype/freetype_2.4.3.bb6
2 files changed, 14 insertions, 3 deletions
diff --git a/recipes/freetype/freetype-2.4.4/no-hardcode.patch b/recipes/freetype/freetype-2.4.4/no-hardcode.patch
new file mode 100644
index 0000000..44ae450
--- /dev/null
+++ b/recipes/freetype/freetype-2.4.4/no-hardcode.patch
@@ -0,0 +1,11 @@
+--- freetype-2.1.10/builds/unix/freetype-config.in.old 2006-05-01 12:39:20.000000000 +0100
++++ freetype-2.1.10/builds/unix/freetype-config.in 2006-05-01 12:39:34.000000000 +0100
+@@ -16,7 +16,7 @@
+ libdir=@libdir@
+ enable_shared=@enable_shared@
+ wl=@wl@
+-hardcode_libdir_flag_spec='@hardcode_libdir_flag_spec@'
++hardcode_libdir_flag_spec=''
+
+ usage()
+ {
diff --git a/recipes/freetype/freetype_2.4.3.bb b/recipes/freetype/freetype_2.4.3.bb
index dfc1b43..66d2e51 100644
--- a/recipes/freetype/freetype_2.4.3.bb
+++ b/recipes/freetype/freetype_2.4.3.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Freetype font rendering library"
SECTION = "libs"
LICENSE = "freetype GPLv2"
-PR = "r2"
+PR = "r1"
DEPENDS = "zlib"
SRC_URI = "\
@@ -23,9 +23,9 @@ LDFLAGS_append = " -Wl,-rpath-link -Wl,${STAGING_DIR_TARGET}${libdir}"
do_configure() {
cd builds/unix
- libtoolize --force --copy
- aclocal -I .
gnu-configize --force
+ aclocal -I .
+ libtoolize --force --copy
autoconf
cd ${S}
oe_runconf