* tk: compiles now with some restrictions

	 - BIG FAT WARNING: untested yet


git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@9669 33e552b5-05e3-0310-8538-816dae2090ed

1 files changed, 69 insertions, 31 deletions

diff --git a/rules/tk.make b/rules/tk.make
index a4cb7bb48..d5250a6b2 100644
--- a/rules/tk.make
+++ b/rules/tk.make
@@ -2,6 +2,7 @@
 # $Id: template 6655 2007-01-02 12:55:21Z rsc $
 #
 # Copyright (C) 2007 by Bjoern Buerger <b.buerger@pengutronix.de>
+# Copyright (C) 2009 by Juergen Beisert
 #
 # See CREDITS for details about who has contributed to this project.
 #
@@ -17,9 +18,10 @@ PACKAGES-$(PTXCONF_TK) += tk
 #
 # Paths and names
 #
-TK_MAJOR	:= 8.4
-TK_PL		:= 15
-TK_VERSION	:= $(TK_MAJOR).$(TK_PL)
+TK_MAJOR	:= 8
+TK_MINOR	:= 5
+TK_PL		:= 6
+TK_VERSION	:= $(TK_MAJOR).$(TK_MINOR).$(TK_PL)
 TK		:= tk$(TK_VERSION)
 TK_SUFFIX	:= -src.tar.gz
 TK_URL		:= $(PTXCONF_SETUP_SFMIRROR)/tcl/$(TK)$(TK_SUFFIX)
@@ -30,12 +32,6 @@ TK_DIR		:= $(BUILDDIR)/$(TK)
 # Get
 # ----------------------------------------------------------------------------
 
-tk_get: $(STATEDIR)/tk.get
-
-$(STATEDIR)/tk.get: $(tk_get_deps_default)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
-
 $(TK_SOURCE):
 	@$(call targetinfo, $@)
 	@$(call get, TK)
@@ -44,9 +40,7 @@ $(TK_SOURCE):
 # Extract
 # ----------------------------------------------------------------------------
 
-tk_extract: $(STATEDIR)/tk.extract
-
-$(STATEDIR)/tk.extract: $(tk_extract_deps_default)
+$(STATEDIR)/tk.extract:
 	@$(call targetinfo, $@)
 	@$(call clean, $(TK_DIR))
 	@$(call extract, TK)
@@ -57,8 +51,6 @@ $(STATEDIR)/tk.extract: $(tk_extract_deps_default)
 # Prepare
 # ----------------------------------------------------------------------------
 
-tk_prepare: $(STATEDIR)/tk.prepare
-
 TK_PATH	:= PATH=$(CROSS_PATH)
 TK_ENV 	:= $(CROSS_ENV)
 TK_MAKEVARS	 =  CROSS_COMPILE=$(COMPILER_PREFIX)
@@ -66,12 +58,46 @@ TK_MAKEVARS	 =  CROSS_COMPILE=$(COMPILER_PREFIX)
 #
 # autoconf
 #
-TK_AUTOCONF := $(CROSS_AUTOCONF_USR)
-TK_AUTOCONF += --target=$(PTXCONF_GNU_TARGET)
-
-$(STATEDIR)/tk.prepare: $(tk_prepare_deps_default)
+TK_AUTOCONF := $(CROSS_AUTOCONF_USR) \
+	--disable-rpath \
+	--disable-symbols \
+	--enable-load \
+	--enable-shared \
+	--with-tcl=$(PTXCONF_SYSROOT_TARGET)/usr/lib
+
+ifdef PTXCONF_TK_THREADS
+TK_AUTOCONF += --enable-threads
+else
+TK_AUTOCONF += --disable-threads
+endif
+
+ifdef PTXCONF_TK_XFT
+TK_AUTOCONF += --enable-xft
+else
+TK_AUTOCONF += --disable-xft
+endif
+
+# 'configure' rejects some tests due to cross compiling
+
+# checking system version... Linux-2.6.25.4-ptx <-- it detects host's one!
+TK_AUTOCONF += tcl_cv_sys_version=Linux-$(PTXCONF_KERNEL_VERSION)
+
+# FIXME: Currently it ends up in a compiler badness due to xft returns
+# host paths when someone queries for its paths
+ifdef PTXCONF_TK_XFT
+TK_AUTOCONF += \
+	ac_cv_header_X11_Xft_Xft_h=yes \
+	ac_cv_lib_Xft_FT_New_Face=yes
+endif
+
+# it does not detect the BSP variant of X
+TK_AUTOCONF += \
+	x_includes=$(PTXCONF_SYSROOT_TARGET)/usr/include \
+	x_libraries=$(PTXCONF_SYSROOT_TARGET)/usr/lib
+
+$(STATEDIR)/tk.prepare:
 	@$(call targetinfo, $@)
-	@$(call clean, $(TK_DIR)/config.cache)
+	@$(call clean, $(TK_DIR)/unix/config.cache)
 	cd $(TK_DIR)/unix && \
 		$(TK_PATH) $(TK_ENV) \
 		./configure $(TK_AUTOCONF)
@@ -81,9 +107,7 @@ $(STATEDIR)/tk.prepare: $(tk_prepare_deps_default)
 # Compile
 # ----------------------------------------------------------------------------
 
-tk_compile: $(STATEDIR)/tk.compile
-
-$(STATEDIR)/tk.compile: $(tk_compile_deps_default)
+$(STATEDIR)/tk.compile:
 	@$(call targetinfo, $@)
 	cd $(TK_DIR)/unix && $(TK_PATH) $(MAKE) $(PARALLELMFLAGS)
 	@$(call touch, $@)
@@ -92,20 +116,16 @@ $(STATEDIR)/tk.compile: $(tk_compile_deps_default)
 # Install
 # ----------------------------------------------------------------------------
 
-tk_install: $(STATEDIR)/tk.install
-
-$(STATEDIR)/tk.install: $(tk_install_deps_default)
+$(STATEDIR)/tk.install:
 	@$(call targetinfo, $@)
-	@$(call install, TK)
+	@$(call install, TK, $(TK_DIR)/unix, DESTDIR=$(PTXCONF_SYSROOT_TARGET) install)
 	@$(call touch, $@)
 
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
 
-tk_targetinstall: $(STATEDIR)/tk.targetinstall
-
-$(STATEDIR)/tk.targetinstall: $(tk_targetinstall_deps_default)
+$(STATEDIR)/tk.targetinstall:
 	@$(call targetinfo, $@)
 
 	@$(call install_init, tk)
@@ -113,11 +133,29 @@ $(STATEDIR)/tk.targetinstall: $(tk_targetinstall_deps_default)
 	@$(call install_fixup, tk,PRIORITY,optional)
 	@$(call install_fixup, tk,VERSION,$(TK_VERSION))
 	@$(call install_fixup, tk,SECTION,base)
-	@$(call install_fixup, tk,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, tk,AUTHOR,"Juergen Beisert <juergen\@kreuzholzen.de>")
 	@$(call install_fixup, tk,DEPENDS,)
 	@$(call install_fixup, tk,DESCRIPTION,missing)
 
-	@$(call install_copy, tk, 0, 0, 0755, $(TK_DIR)/foobar, /dev/null)
+
+	@$(call install_copy, tk, 0, 0, 0644, -, \
+		/usr/lib/libtk$(TK_MAJOR).$(TK_MINOR).so)
+
+ifdef PTXCONF_TK_WISH
+	@$(call install_copy, tk, 0, 0, 0755, -, /usr/bin/wish8.5)
+# a simplified link is very useful
+	@$(call install_link, tk, \
+		/usr/bin/wish$(TK_MAJOR).$(TK_MINOR), /usr/bin/wish)
+endif
+ifdef PTXCONF_TK_TTK
+	@$(call install_copy, tk, 0, 0, 0755, /usr/lib/tk$(TK_MAJOR).$(TK_MINOR)/ttk)
+	cd $(TK_DIR)/library/ttk; \
+	for file in *.tcl ; do \
+		$(call install_copy, tk, 0, 0, 0644, \
+			$(TK_DIR)/library/ttk/$$file, \
+			/usr/lib/tk$(TK_MAJOR).$(TK_MINOR)/ttk/$$file, n); \
+	done
+endif
 
 	@$(call install_finish, tk)