Merge branch 'master' into llvm-support

5 files changed, 28 insertions, 50 deletions

diff --git a/mk/macros.packages.mk b/mk/macros.packages.mk
index 43787bf..816dccb 100644
--- a/mk/macros.packages.mk
+++ b/mk/macros.packages.mk
@@ -39,11 +39,11 @@ define embtk_wget
 endef
 
 #
-# embtk_pkgconfig_getlibs:
+# embtk_pkgconfig-libs:
 # A macro to get pkg-config libs entry for a target package
 # Usage: $(call embtk_pkgconfig_getlibs,pkgname)
 #
-define embtk_pkgconfig_getlibs
+define embtk_pkgconfig-libs
 	$(shell									\
 		PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH)			\
 		PKG_CONFIG_LIBDIR="$(EMBTK_PKG_CONFIG_LIBDIR)"			\
@@ -51,11 +51,11 @@ define embtk_pkgconfig_getlibs
 endef
 
 #
-# embtk_pkgconfig_getcflags:
+# embtk_pkgconfig-cflags:
 # A macro to get pkg-config cflags entry for a target package
 # Usage: $(call embtk_pkgconfig_getcflags,pkgname)
 #
-define embtk_pkgconfig_getcflags
+define embtk_pkgconfig-cflags
 	$(shell									\
 		PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH)			\
 		PKG_CONFIG_LIBDIR="$(EMBTK_PKG_CONFIG_LIBDIR)"			\
@@ -77,7 +77,7 @@ __lt_usr/lib		= $(embtk_space)\/usr\/$(LIBDIR)\/
 __lt_sysroot/usr/lib	= $(embtk_space)$(embtk_sysroot)\/usr\/$(LIBDIR)\/
 __lt_path		= $(addprefix $(embtk_sysroot)/usr/,$(or $(1),$(LIBDIR)))
 define __embtk_fix_libtool_files
-	__lt_las=`find $(__lt_path) -name *.la`;				\
+	__lt_las=$$(find $(__lt_path) -name '*.la');				\
 	for la in $$__lt_las; do						\
 		sed -i "s;$(__ltlibdirold);$(__ltlibdirnew);" $$la;		\
 		sed -i "s;$(__lt_usr/lib);$(__lt_sysroot/usr/lib);g" $$la;	\
@@ -309,8 +309,8 @@ define embtk_configure_pkg
 	OBJCOPY=$(TARGETOBJCOPY)						\
 	CFLAGS="$(TARGET_CFLAGS)"						\
 	CXXFLAGS="$(TARGET_CFLAGS)"						\
-	LDFLAGS="-L$(embtk_sysroot)/$(LIBDIR) -L$(embtk_sysroot)/usr/$(LIBDIR)"		\
-	CPPFLAGS="-I$(embtk_sysroot)/usr/include"					\
+	LDFLAGS="-L$(embtk_sysroot)/$(LIBDIR) -L$(embtk_sysroot)/usr/$(LIBDIR)"	\
+	CPPFLAGS="-I$(embtk_sysroot)/usr/include"				\
 	PKG_CONFIG="$(PKGCONFIG_BIN)"						\
 	PKG_CONFIG_PATH="$(EMBTK_PKG_CONFIG_PATH)"				\
 	PKG_CONFIG_LIBDIR="$(EMBTK_PKG_CONFIG_LIBDIR)"				\
@@ -403,10 +403,10 @@ define __embtk_install_pkg_make
 	$(call embtk_decompress_pkg,$(1))
 	$(if $(embtk_beforeinstall_$(pkgv)),$(embtk_beforeinstall_$(pkgv)))
 	$(if $(__embtk_autotoolspkg-y),$(call embtk_configure_pkg,$(1)))
-	$(if $(__embtk_pkg_makedirs),					\
+	$(if $(__embtk_pkg_makedirs),						\
 		$(__embtk_multi_make),						\
 		$(__embtk_single_make))
-	$(if $(__embtk_pkg_makedirs),					\
+	$(if $(__embtk_pkg_makedirs),						\
 		$(__embtk_multi_make_install),					\
 		$(__embtk_single_make_install))
 	$(if $(__embtk_autotoolspkg-y)$(__embtk_pkg_pkgconfigs),
@@ -421,10 +421,10 @@ define __embtk_install_hostpkg_make
 	$(call embtk_decompress_pkg,$(1))
 	$(if $(embtk_beforeinstall_$(pkgv)),$(embtk_beforeinstall_$(pkgv)))
 	$(if $(__embtk_autotoolspkg-y),$(call embtk_configure_hostpkg,$(1)))
-	$(if $(__embtk_pkg_makedirs),					\
+	$(if $(__embtk_pkg_makedirs),						\
 		$(__embtk_multi_make),						\
 		$(__embtk_single_make))
-	$(if $(__embtk_pkg_makedirs),					\
+	$(if $(__embtk_pkg_makedirs),						\
 		$(__embtk_multi_make_hostinstall),				\
 		$(__embtk_single_make_hostinstall))
 	$(Q)touch $(__embtk_pkg_dotinstalled_f)
diff --git a/packages/graphics/fontconfig/fontconfig.mk b/packages/graphics/fontconfig/fontconfig.mk
index a29c461..8209fed 100644
--- a/packages/graphics/fontconfig/fontconfig.mk
+++ b/packages/graphics/fontconfig/fontconfig.mk
@@ -26,28 +26,20 @@
 FONTCONFIG_NAME		:= fontconfig
 FONTCONFIG_VERSION	:= $(call embtk_get_pkgversion,fontconfig)
 FONTCONFIG_SITE		:= http://fontconfig.org/release
-FONTCONFIG_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 FONTCONFIG_PACKAGE	:= fontconfig-$(FONTCONFIG_VERSION).tar.gz
 FONTCONFIG_SRC_DIR	:= $(embtk_pkgb)/fontconfig-$(FONTCONFIG_VERSION)
 FONTCONFIG_BUILD_DIR	:= $(embtk_pkgb)/fontconfig-$(FONTCONFIG_VERSION)
 
-FONTCONFIG_BINS		= fc-cache fc-cat fc-list fc-match fc-query fc-scan
-FONTCONFIG_SBINS	=
-FONTCONFIG_INCLUDES	= fontconfig
-FONTCONFIG_LIBS		= libfontconfig*
-FONTCONFIG_PKGCONFIGS	= fontconfig.pc
+FONTCONFIG_BINS		:= fc-cache fc-cat fc-list fc-match fc-query fc-scan
+FONTCONFIG_INCLUDES	:= fontconfig
+FONTCONFIG_LIBS		:= libfontconfig*
+FONTCONFIG_PKGCONFIGS	:= fontconfig.pc
 
-LIBXML2_CFLAGS-y	= -I$(embtk_sysroot)/usr/include/libxml2
-LIBXML2_LIBS-y		= -L$(embtk_sysroot)/usr/$(LIBDIR) -lxml2
+LIBXML2_CFLAGS-y	:= -I$(embtk_sysroot)/usr/include/libxml2
+LIBXML2_LIBS-y		:= -L$(embtk_sysroot)/usr/$(LIBDIR) -lxml2
 
-FREETYPE_CFLAGS-y	= $(shell						\
-				PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH)	\
-				PKG_CONFIG_LIBDIR="$(EMBTK_PKG_CONFIG_LIBDIR)"	\
-				$(PKGCONFIG_BIN) freetype2 --cflags)
-FREETYPE_LIBS-y		= $(shell						\
-				PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH)	\
-				PKG_CONFIG_LIBDIR="$(EMBTK_PKG_CONFIG_LIBDIR)"	\
-				$(PKGCONFIG_BIN) freetype2 --libs)
+FREETYPE_CFLAGS-y	= $(call embtk_pkgconfig-cflags,freetype2)
+FREETYPE_LIBS-y		= $(call embtk_pkgconfig-libs,freetype2)
 
 FONTCONFIG_CONFIGURE_ENV	= LIBXML2_CFLAGS="$(LIBXML2_CFLAGS-y)"
 FONTCONFIG_CONFIGURE_ENV	+= LIBXML2_CFLAGS="$(LIBXML2_LIBS-y)"
diff --git a/packages/graphics/freetype/freetype.mk b/packages/graphics/freetype/freetype.mk
index f3af3a6..f7d1de1 100644
--- a/packages/graphics/freetype/freetype.mk
+++ b/packages/graphics/freetype/freetype.mk
@@ -26,7 +26,6 @@
 FREETYPE_NAME		:= freetype
 FREETYPE_VERSION	:= $(call embtk_get_pkgversion,freetype)
 FREETYPE_SITE		:= http://downloads.sourceforge.net/project/freetype/freetype2/$(FREETYPE_VERSION)
-FREETYPE_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 FREETYPE_PACKAGE	:= freetype-$(FREETYPE_VERSION).tar.bz2
 FREETYPE_SRC_DIR	:= $(embtk_pkgb)/freetype-$(FREETYPE_VERSION)
 FREETYPE_BUILD_DIR	:= $(embtk_pkgb)/freetype-$(FREETYPE_VERSION)
@@ -39,4 +38,3 @@ FREETYPE_PKGCONFIGS	= freetype*.pc
 
 FREETYPE_DEPS		:= zlib_install
 FREETYPE_MAKE_OPTS	:= LIBTOOL=$(FREETYPE_BUILD_DIR)/builds/unix/libtool
-
diff --git a/packages/graphics/pango/pango.mk b/packages/graphics/pango/pango.mk
index b7e44cb..1a8115d 100644
--- a/packages/graphics/pango/pango.mk
+++ b/packages/graphics/pango/pango.mk
@@ -27,7 +27,6 @@ PANGO_NAME		:= pango
 PANGO_MAJOR_VERSION	:= $(call embtk_get_pkgversion,pango_major)
 PANGO_VERSION		:= $(call embtk_get_pkgversion,pango)
 PANGO_SITE		:= http://ftp.gnome.org/pub/gnome/sources/pango/$(PANGO_MAJOR_VERSION)
-PANGO_SITE_MIRROR3	:= ftp://ftp.embtoolkit.org/embtoolkit.org/packages-mirror
 PANGO_PACKAGE		:= pango-$(PANGO_VERSION).tar.bz2
 PANGO_SRC_DIR		:= $(embtk_pkgb)/pango-$(PANGO_VERSION)
 PANGO_BUILD_DIR		:= $(embtk_pkgb)/pango-$(PANGO_VERSION)
@@ -45,23 +44,12 @@ PANGO_DEPS-y		:= $(if $(CONFIG_EMBTK_HAVE_PANGO_WITH_X),		\
 				libx11_install)
 
 PANGO_CONFIGURE_OPTS	:= $(PANGO_CONFIGURE_OPTS-y)
-PANGO_DEPS		:= glib_install fontconfig_install $(PANGO_DEPS-y)	\
-			cairo_install
+PANGO_DEPS		:= glib_install fontconfig_install
+PANGO_DEPS		+= $(PANGO_DEPS-y) cairo_install
 
 define embtk_postinstall_pango
-	$(Q)test -e $(PANGO_BUILD_DIR)/.patchlibtool || \
-	$(MAKE) $(PANGO_BUILD_DIR)/.patchlibtool
+	$(Q)mkdir -p $(embtk_rootfs)
+	$(Q)mkdir -p $(embtk_rootfs)/usr
+	$(Q)mkdir -p $(embtk_rootfs)/usr/$(LIBDIR)
 	$(Q)-cp -R $(embtk_sysroot)/usr/$(LIBDIR)/pango $(embtk_rootfs)/usr/$(LIBDIR)/
 endef
-
-$(PANGO_BUILD_DIR)/.patchlibtool:
-	$(Q)PANGO_LT_FILES=`find $(embtk_sysroot)/usr/$(LIBDIR)/* -type f -name *.la`; \
-	for i in $$PANGO_LT_FILES; \
-	do \
-	sed \
-	-e "s;\/usr\/$(LIBDIR)\/libpangoft2-1.0.la ; $(embtk_sysroot)\/usr\/$(LIBDIR)\/libpangoft2-1.0.la ;" \
-	-e "s;\/usr\/$(LIBDIR)\/libpango-1.0.la ; $(embtk_sysroot)\/usr\/$(LIBDIR)\/libpango-1.0.la ;" \
-	< $$i > $$i.new; \
-	mv $$i.new $$i; \
-	done
-	@touch $@
diff --git a/packages/x11/xserver/xserver.mk b/packages/x11/xserver/xserver.mk
index 65e56f7..9955cdb 100644
--- a/packages/x11/xserver/xserver.mk
+++ b/packages/x11/xserver/xserver.mk
@@ -69,10 +69,10 @@ XSERVER_CONFIGURE_OPTS := $(XSERVER_VARIANT) --with-sha1=libcrypto \
 		--with-os-name=$(STRICT_GNU_TARGET) \
 		--with-os-vendor="embtoolkit.org"
 
-XSERVER_CONFIGURE_ENV = XLIB_CFLAGS="$(call embtk_pkgconfig_getcflags,xcb)"
-XSERVER_CONFIGURE_ENV += XLIB_LIBS="$(call embtk_pkgconfig_getlibs,xcb)"
-XSERVER_CONFIGURE_ENV += TSLIB_CFLAGS="$(call embtk_pkgconfig_getcflags,tslib)"
-XSERVER_CONFIGURE_ENV += TSLIB_LIBS="$(call embtk_pkgconfig_getlibs,tslib)"
+XSERVER_CONFIGURE_ENV = XLIB_CFLAGS="$(call embtk_pkgconfig-cflags,xcb)"
+XSERVER_CONFIGURE_ENV += XLIB_LIBS="$(call embtk_pkgconfig-libs,xcb)"
+XSERVER_CONFIGURE_ENV += TSLIB_CFLAGS="$(call embtk_pkgconfig-cflags,tslib)"
+XSERVER_CONFIGURE_ENV += TSLIB_LIBS="$(call embtk_pkgconfig-libs,tslib)"
 
 ifeq ($(CONFIG_EMBTK_HAVE_XSERVER_WITH_TSLIB),y)
 XSERVER_DEPS += tslib_install