From 357282e2111fa6b84b34185d9916b0c17119480c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 12 Jan 2010 22:33:31 +0000 Subject: freetype: Convert to BBCLASSEXTEND Signed-off-by: Richard Purdie --- meta/packages/freetype/files/configure.patch | 47 ---------------------- meta/packages/freetype/files/no-hardcode.patch | 11 ----- .../freetype/freetype-2.3.5/configure.patch | 47 ++++++++++++++++++++++ .../freetype/freetype-2.3.5/no-hardcode.patch | 11 +++++ meta/packages/freetype/freetype-native_2.3.5.bb | 9 ----- meta/packages/freetype/freetype_2.3.5.bb | 9 +++++ 6 files changed, 67 insertions(+), 67 deletions(-) delete mode 100644 meta/packages/freetype/files/configure.patch delete mode 100644 meta/packages/freetype/files/no-hardcode.patch create mode 100644 meta/packages/freetype/freetype-2.3.5/configure.patch create mode 100644 meta/packages/freetype/freetype-2.3.5/no-hardcode.patch delete mode 100644 meta/packages/freetype/freetype-native_2.3.5.bb diff --git a/meta/packages/freetype/files/configure.patch b/meta/packages/freetype/files/configure.patch deleted file mode 100644 index f11cf96be..000000000 --- a/meta/packages/freetype/files/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/meta/packages/freetype/files/no-hardcode.patch b/meta/packages/freetype/files/no-hardcode.patch deleted file mode 100644 index 44ae450a1..000000000 --- a/meta/packages/freetype/files/no-hardcode.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/meta/packages/freetype/freetype-2.3.5/configure.patch b/meta/packages/freetype/freetype-2.3.5/configure.patch new file mode 100644 index 000000000..f11cf96be --- /dev/null +++ b/meta/packages/freetype/freetype-2.3.5/configure.patch @@ -0,0 +1,47 @@ + +# +# 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/meta/packages/freetype/freetype-2.3.5/no-hardcode.patch b/meta/packages/freetype/freetype-2.3.5/no-hardcode.patch new file mode 100644 index 000000000..44ae450a1 --- /dev/null +++ b/meta/packages/freetype/freetype-2.3.5/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/meta/packages/freetype/freetype-native_2.3.5.bb b/meta/packages/freetype/freetype-native_2.3.5.bb deleted file mode 100644 index f44ca4b55..000000000 --- a/meta/packages/freetype/freetype-native_2.3.5.bb +++ /dev/null @@ -1,9 +0,0 @@ -require freetype_${PV}.bb -inherit native - -EXTRA_OEMAKE= - -do_configure() { - (cd builds/unix && gnu-configize) || die "failure running gnu-configize" - oe_runconf -} diff --git a/meta/packages/freetype/freetype_2.3.5.bb b/meta/packages/freetype/freetype_2.3.5.bb index f5934bd66..5bbbd7d65 100644 --- a/meta/packages/freetype/freetype_2.3.5.bb +++ b/meta/packages/freetype/freetype_2.3.5.bb @@ -14,6 +14,7 @@ inherit autotools pkgconfig binconfig LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool" EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" +EXTRA_OEMAKE_virtclass-native = "" EXTRA_OECONF = "--without-zlib" do_configure() { @@ -26,9 +27,17 @@ do_configure() { oe_runconf } +do_configure_virtclass-native() { + (cd builds/unix && gnu-configize) || die "failure running gnu-configize" + oe_runconf +} + do_compile_prepend() { ${BUILD_CC} -o objs/apinames src/tools/apinames.c } FILES_${PN} = "${libdir}/lib*${SOLIBS}" FILES_${PN}-dev += "${bindir}" + +BBCLASSEXTEND = "native" + -- cgit v1.2.3