From 0aabef127155575e8c8d660605f9401ab15356aa Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 24 Feb 2011 17:41:36 +0100 Subject: allow native build of a lot of packages STAGING_TARGET_DIR is used for package Makefile's for include and library search path's. STAGING_DIR is used for common code in mk/ or Makefile/rules.mk. STAGING_TARGET_DIR is /usr when native builds are used. --- package/fontconfig/Makefile | 17 +++++++++++++-- package/fontconfig/patches/patch-configure | 18 ++++++++++++++++ .../fontconfig/patches/patch-fc-arch_Makefile_in | 25 +++++++++++++++++++--- .../fontconfig/patches/patch-fc-case_Makefile_in | 12 +++++++---- .../patches/patch-fc-glyphname_Makefile_in | 25 +++++++++++++++++++--- .../fontconfig/patches/patch-fc-lang_Makefile_in | 24 ++++++++++++++++----- 6 files changed, 104 insertions(+), 17 deletions(-) create mode 100644 package/fontconfig/patches/patch-configure (limited to 'package/fontconfig') diff --git a/package/fontconfig/Makefile b/package/fontconfig/Makefile index 9762afca1..0aa2e0552 100644 --- a/package/fontconfig/Makefile +++ b/package/fontconfig/Makefile @@ -14,20 +14,33 @@ PKG_BUILDDEP:= freetype libxml2 PKG_URL:= http://fontconfig.org/ PKG_SITES:= http://fontconfig.org/release/ +PKG_SUBPKGS:= FONTCONFIG FONTCONFIG_DEV +PKGSD_FONTCONFIG_DEV:= configuring and customizing font access headers +PKGSC_FONTCONFIG_DEV:= devel + ifeq ($(ADK_STATIC),y) PKG_OPTS:= libonly endif include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,FONTCONFIG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,FONTCONFIG,fontconfig,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,FONTCONFIG_DEV,fontconfig-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FONTCONFIG_DEV},${PKGSC_FONTCONFIG_DEV},${PKG_OPTS})) CONFIGURE_ARGS+= --with-arch=${ARCH} \ --disable-docs -post-install: +fontconfig-install: ${INSTALL_DIR} ${IDIR_FONTCONFIG}/usr/lib ${IDIR_FONTCONFIG}/etc/fonts ${CP} ${WRKINST}/usr/lib/libfontconfig.so* ${IDIR_FONTCONFIG}/usr/lib $(CP) ${WRKINST}/etc/fonts/* ${IDIR_FONTCONFIG}/etc/fonts +fontconfig-dev-install: + ${INSTALL_DIR} ${IDIR_FONTCONFIG_DEV}/usr/lib/pkgconfig + ${CP} ${WRKINST}/usr/lib/pkgconfig/fontconfig.pc \ + ${IDIR_FONTCONFIG_DEV}/usr/lib/pkgconfig + ${INSTALL_DIR} ${IDIR_FONTCONFIG_DEV}/usr/include + ${CP} ${WRKINST}/usr/include/* \ + ${IDIR_FONTCONFIG_DEV}/usr/include + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/fontconfig/patches/patch-configure b/package/fontconfig/patches/patch-configure new file mode 100644 index 000000000..2c3e4162c --- /dev/null +++ b/package/fontconfig/patches/patch-configure @@ -0,0 +1,18 @@ +--- fontconfig-2.8.0.orig/configure 2009-11-19 00:49:41.000000000 +0100 ++++ fontconfig-2.8.0/configure 2011-02-24 14:32:50.000000000 +0100 +@@ -817,6 +817,7 @@ ICONV_LIBS + ARCHITECTURE + EXEEXT_FOR_BUILD + CC_FOR_BUILD ++CFLAGS_FOR_BUILD + CROSS_COMPILING_FALSE + CROSS_COMPILING_TRUE + WARN_CFLAGS +@@ -11872,6 +11873,7 @@ if test "${ac_cv_prog_CC_FOR_BUILD+set}" + else + if test -n "$CC_FOR_BUILD"; then + ac_cv_prog_CC_FOR_BUILD="$CC_FOR_BUILD" # Let the user override the test. ++ ac_cv_prog_CFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD" # Let the user override the test. + else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + for as_dir in $PATH diff --git a/package/fontconfig/patches/patch-fc-arch_Makefile_in b/package/fontconfig/patches/patch-fc-arch_Makefile_in index fd4d60d5f..1544ea22e 100644 --- a/package/fontconfig/patches/patch-fc-arch_Makefile_in +++ b/package/fontconfig/patches/patch-fc-arch_Makefile_in @@ -1,10 +1,20 @@ --- fontconfig-2.8.0.orig/fc-arch/Makefile.in 2009-11-19 00:49:37.000000000 +0100 -+++ fontconfig-2.8.0/fc-arch/Makefile.in 2009-12-04 20:07:55.995064329 +0100 -@@ -114,10 +114,10 @@ AWK = @AWK@ ++++ fontconfig-2.8.0/fc-arch/Makefile.in 2011-02-24 14:37:06.000000000 +0100 +@@ -82,7 +82,7 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) + AM_V_CC = $(am__v_CC_$(V)) + am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) + am__v_CC_0 = @echo " CC " $@; +@@ -114,10 +114,11 @@ AWK = @AWK@ CC = @CC_FOR_BUILD@ CCDEPMODE = @CCDEPMODE@ CC_FOR_BUILD = @CC_FOR_BUILD@ -CFLAGS = @CFLAGS@ ++CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ +CFLAGS = CONFDIR = @CONFDIR@ CPP = @CPP@ @@ -13,7 +23,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -@@ -154,7 +154,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -154,7 +155,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ @@ -22,3 +32,12 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +@@ -249,7 +250,7 @@ target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS) -o $@ + INCLUDES = -I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS) + TMPL = fcarch.tmpl.h + STMPL = ${top_srcdir}/fc-arch/fcarch.tmpl.h diff --git a/package/fontconfig/patches/patch-fc-case_Makefile_in b/package/fontconfig/patches/patch-fc-case_Makefile_in index cc0e60571..ed5a403ed 100644 --- a/package/fontconfig/patches/patch-fc-case_Makefile_in +++ b/package/fontconfig/patches/patch-fc-case_Makefile_in @@ -1,7 +1,11 @@ --- fontconfig-2.8.0.orig/fc-case/Makefile.in 2009-11-19 00:49:38.000000000 +0100 -+++ fontconfig-2.8.0/fc-case/Makefile.in 2009-12-04 20:03:05.536919385 +0100 -@@ -87,17 +87,17 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUD - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++++ fontconfig-2.8.0/fc-case/Makefile.in 2011-02-24 14:30:29.000000000 +0100 +@@ -84,20 +84,20 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) AM_V_CC = $(am__v_CC_$(V)) am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; @@ -26,7 +30,7 @@ CCDEPMODE = @CCDEPMODE@ CC_FOR_BUILD = @CC_FOR_BUILD@ -CFLAGS = @CFLAGS@ -+CFLAGS = ++CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ CONFDIR = @CONFDIR@ CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ diff --git a/package/fontconfig/patches/patch-fc-glyphname_Makefile_in b/package/fontconfig/patches/patch-fc-glyphname_Makefile_in index c8573a2e2..eed138f85 100644 --- a/package/fontconfig/patches/patch-fc-glyphname_Makefile_in +++ b/package/fontconfig/patches/patch-fc-glyphname_Makefile_in @@ -1,10 +1,20 @@ --- fontconfig-2.8.0.orig/fc-glyphname/Makefile.in 2009-11-19 00:49:38.000000000 +0100 -+++ fontconfig-2.8.0/fc-glyphname/Makefile.in 2009-12-04 20:06:40.117024551 +0100 -@@ -114,10 +114,10 @@ AWK = @AWK@ ++++ fontconfig-2.8.0/fc-glyphname/Makefile.in 2011-02-24 14:35:52.000000000 +0100 +@@ -82,7 +82,7 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) + AM_V_CC = $(am__v_CC_$(V)) + am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) + am__v_CC_0 = @echo " CC " $@; +@@ -114,10 +114,11 @@ AWK = @AWK@ CC = @CC_FOR_BUILD@ CCDEPMODE = @CCDEPMODE@ CC_FOR_BUILD = @CC_FOR_BUILD@ -CFLAGS = @CFLAGS@ ++CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ +CFLAGS = CONFDIR = @CONFDIR@ CPP = @CPP@ @@ -13,7 +23,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -@@ -154,7 +154,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -154,7 +155,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ @@ -22,3 +32,12 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +@@ -249,7 +250,7 @@ target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS) -o $@ + INCLUDES = -I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS) + TMPL = fcglyphname.tmpl.h + STMPL = ${top_srcdir}/fc-glyphname/${TMPL} diff --git a/package/fontconfig/patches/patch-fc-lang_Makefile_in b/package/fontconfig/patches/patch-fc-lang_Makefile_in index da9bc5435..c557e64ab 100644 --- a/package/fontconfig/patches/patch-fc-lang_Makefile_in +++ b/package/fontconfig/patches/patch-fc-lang_Makefile_in @@ -1,7 +1,11 @@ --- fontconfig-2.8.0.orig/fc-lang/Makefile.in 2009-11-19 00:49:38.000000000 +0100 -+++ fontconfig-2.8.0/fc-lang/Makefile.in 2009-12-04 21:43:12.000000000 +0100 -@@ -85,14 +85,14 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUD - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++++ fontconfig-2.8.0/fc-lang/Makefile.in 2011-02-24 14:34:36.000000000 +0100 +@@ -82,17 +82,17 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) AM_V_CC = $(am__v_CC_$(V)) am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) -am__v_CC_0 = @echo " CC " $@; @@ -17,11 +21,12 @@ AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; -@@ -114,10 +114,10 @@ AWK = @AWK@ +@@ -114,10 +114,11 @@ AWK = @AWK@ CC = @CC_FOR_BUILD@ CCDEPMODE = @CCDEPMODE@ CC_FOR_BUILD = @CC_FOR_BUILD@ -CFLAGS = @CFLAGS@ ++CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ +CFLAGS = CONFDIR = @CONFDIR@ CPP = @CPP@ @@ -30,7 +35,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ -@@ -154,7 +154,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -154,7 +155,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LD = @LD@ @@ -39,3 +44,12 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +@@ -249,7 +250,7 @@ target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS) -o $@ + INCLUDES = -I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS) + TMPL = fclang.tmpl.h + STMPL = ${top_srcdir}/fc-lang/fclang.tmpl.h -- cgit v1.2.3