diff options
author | Richard Purdie <richard@openedhand.com> | 2006-05-09 18:38:19 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2006-05-09 18:38:19 +0000 |
commit | b4cb437c6595ff8ac13506e502fe04b1a60c4e04 (patch) | |
tree | f529de217094f1a49049f90c49d779a49e19cd7c /openembedded/packages/freetype | |
parent | 3baacb49c13a48798d45e30a0a0076ca0b8c9e6a (diff) | |
download | openembedded-core-b4cb437c6595ff8ac13506e502fe04b1a60c4e04.tar.gz openembedded-core-b4cb437c6595ff8ac13506e502fe04b1a60c4e04.tar.bz2 openembedded-core-b4cb437c6595ff8ac13506e502fe04b1a60c4e04.tar.xz openembedded-core-b4cb437c6595ff8ac13506e502fe04b1a60c4e04.zip |
Merge packages changes from OE into poky.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@386 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/freetype')
-rw-r--r-- | openembedded/packages/freetype/files/no-hardcode.patch | 11 | ||||
-rw-r--r-- | openembedded/packages/freetype/freetype_2.1.10.bb | 5 |
2 files changed, 14 insertions, 2 deletions
diff --git a/openembedded/packages/freetype/files/no-hardcode.patch b/openembedded/packages/freetype/files/no-hardcode.patch new file mode 100644 index 000000000..44ae450a1 --- /dev/null +++ b/openembedded/packages/freetype/files/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/openembedded/packages/freetype/freetype_2.1.10.bb b/openembedded/packages/freetype/freetype_2.1.10.bb index 772b316cc..35c0d0cbd 100644 --- a/openembedded/packages/freetype/freetype_2.1.10.bb +++ b/openembedded/packages/freetype/freetype_2.1.10.bb @@ -2,10 +2,11 @@ DESCRIPTION = "Freetype font rendering library" HOMEPAGE = "http://www.freetype.org" SECTION = "libs" LICENSE = "freetype" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ - file://configure.patch;patch=1" + file://configure.patch;patch=1 \ + file://no-hardcode.patch;patch=1" S = "${WORKDIR}/freetype-${PV}" inherit autotools pkgconfig binconfig |