initial commit for Enea Linux 4.0-140929daisy-140929

Migrated from the internal git server on the daisy-enea-point-release branch

Signed-off-by: Tudor Florea <tudor.florea@enea.com>

6 files changed, 210 insertions, 0 deletions

diff --git a/meta-oe/recipes-devtools/tcltk/tk-8.6.0/confsearch.diff b/meta-oe/recipes-devtools/tcltk/tk-8.6.0/confsearch.diff
new file mode 100644
index 0000000000..c51e475426
--- /dev/null
+++ b/meta-oe/recipes-devtools/tcltk/tk-8.6.0/confsearch.diff
@@ -0,0 +1,32 @@
+Patch by Sergei Golovan allows to find tclConfig.sh in /usr/share/tcltk/tcl8.5
+and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
+installation.
+
+--- tk8.5-8.5.8.orig/unix/configure
++++ tk8.5-8.5.8/unix/configure
+@@ -1431,6 +1431,7 @@
+                        `ls -d ${prefix}/lib 2>/dev/null` \
+                        `ls -d /usr/local/lib 2>/dev/null` \
+                        `ls -d /usr/contrib/lib 2>/dev/null` \
++                       `ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \
+                        `ls -d /usr/lib 2>/dev/null` \
+                        ; do
+                    if test -f "$i/tclConfig.sh" ; then
+--- tk8.5-8.5.8.orig/unix/tcl.m4
++++ tk8.5-8.5.8/unix/tcl.m4
+@@ -93,6 +93,7 @@
+                        `ls -d ${prefix}/lib 2>/dev/null` \
+                        `ls -d /usr/local/lib 2>/dev/null` \
+                        `ls -d /usr/contrib/lib 2>/dev/null` \
++                       `ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \
+                        `ls -d /usr/lib 2>/dev/null` \
+                        ; do
+                    if test -f "$i/tclConfig.sh" ; then
+@@ -223,6 +224,7 @@
+                        `ls -d ${prefix}/lib 2>/dev/null` \
+                        `ls -d /usr/local/lib 2>/dev/null` \
+                        `ls -d /usr/contrib/lib 2>/dev/null` \
++                       `ls -d /usr/share/tcltk/tk8.5 2>/dev/null` \
+                        `ls -d /usr/lib 2>/dev/null` \
+                        ; do
+                    if test -f "$i/tkConfig.sh" ; then
diff --git a/meta-oe/recipes-devtools/tcltk/tk-8.6.0/fix-xft.diff b/meta-oe/recipes-devtools/tcltk/tk-8.6.0/fix-xft.diff
new file mode 100644
index 0000000000..d1bb7105c6
--- /dev/null
+++ b/meta-oe/recipes-devtools/tcltk/tk-8.6.0/fix-xft.diff
@@ -0,0 +1,16 @@
+--- /tmp/configure.in   2010-05-19 13:29:03.000000000 +0200
++++ unix/configure.in   2010-05-19 13:42:05.000000000 +0200
+@@ -526,13 +526,9 @@
+        found_xft="yes"
+        dnl make sure package configurator (xft-config or pkg-config
+        dnl says that xft is present.
+-       XFT_CFLAGS=`xft-config --cflags 2>/dev/null` || found_xft="no"
+-       XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
+-       if test "$found_xft" = "no" ; then
+            found_xft=yes
+            XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || found_xft="no"
+            XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || found_xft="no"
+-       fi
+        AC_MSG_RESULT([$found_xft])
+        dnl make sure that compiling against Xft header file doesn't bomb
+        if test "$found_xft" = "yes" ; then
diff --git a/meta-oe/recipes-devtools/tcltk/tk-8.6.0/non-linux.diff b/meta-oe/recipes-devtools/tcltk/tk-8.6.0/non-linux.diff
new file mode 100644
index 0000000000..9309fc48e1
--- /dev/null
+++ b/meta-oe/recipes-devtools/tcltk/tk-8.6.0/non-linux.diff
@@ -0,0 +1,45 @@
+Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes
+building on non-linux Debian architectures.
+
+--- tk8.5-8.5.8.orig/unix/configure
++++ tk8.5-8.5.8/unix/configure
+@@ -4742,6 +4742,9 @@
+                if test "`uname -s`" = "AIX" ; then
+                    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
+                fi
++               if test "`uname -s`" = "NetBSD" -a -f /etc/debian_version ; then
++                   tcl_cv_sys_version=NetBSD-Debian
++               fi
+            fi
+        fi
+ 
+@@ -5546,7 +5549,7 @@
+ fi
+ 
+            ;;
+-       Linux*)
++       Linux*|GNU*|NetBSD-Debian)
+            SHLIB_CFLAGS="-fPIC"
+            SHLIB_LD_LIBS='${LIBS}'
+            SHLIB_SUFFIX=".so"
+--- tk8.5-8.5.8.orig/unix/tcl.m4
++++ tk8.5-8.5.8/unix/tcl.m4
+@@ -962,6 +962,9 @@
+                if test "`uname -s`" = "AIX" ; then
+                    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
+                fi
++               if test "`uname -s`" = "NetBSD" -a -f /etc/debian_version ; then
++                   tcl_cv_sys_version=NetBSD-Debian
++               fi
+            fi
+        fi
+     ])
+@@ -1422,7 +1425,7 @@
+                ])
+            ])
+            ;;
+-       Linux*)
++       Linux*|GNU*|NetBSD-Debian)
+            SHLIB_CFLAGS="-fPIC"
+            SHLIB_LD_LIBS='${LIBS}'
+            SHLIB_SUFFIX=".so"
diff --git a/meta-oe/recipes-devtools/tcltk/tk-8.6.0/tklibrary.diff b/meta-oe/recipes-devtools/tcltk/tk-8.6.0/tklibrary.diff
new file mode 100644
index 0000000000..ee38c2a1a5
--- /dev/null
+++ b/meta-oe/recipes-devtools/tcltk/tk-8.6.0/tklibrary.diff
@@ -0,0 +1,22 @@
+--- tk8.5-8.5.8.orig/unix/configure
++++ tk8.5-8.5.8/unix/configure
+@@ -11070,7 +11070,7 @@
+     TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
+ fi
+ 
+-TK_LIBRARY='$(prefix)/lib/tk$(VERSION)'
++test -z "$TK_LIBRARY" && TK_LIBRARY='$(prefix)/lib/tk$(VERSION)'
+ PRIVATE_INCLUDE_DIR='$(includedir)'
+ HTML_DIR='$(DISTDIR)/html'
+ TK_PKG_DIR='tk$(VERSION)'
+--- tk8.5-8.5.8.orig/unix/configure.in
++++ tk8.5-8.5.8/unix/configure.in
+@@ -607,7 +607,7 @@
+     TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
+ fi
+ 
+-TK_LIBRARY='$(prefix)/lib/tk$(VERSION)'
++test -z "$TK_LIBRARY" && TK_LIBRARY='$(prefix)/lib/tk$(VERSION)'
+ PRIVATE_INCLUDE_DIR='$(includedir)'
+ HTML_DIR='$(DISTDIR)/html'
+ TK_PKG_DIR='tk$(VERSION)'
diff --git a/meta-oe/recipes-devtools/tcltk/tk-8.6.0/tkprivate.diff b/meta-oe/recipes-devtools/tcltk/tk-8.6.0/tkprivate.diff
new file mode 100644
index 0000000000..4e15469736
--- /dev/null
+++ b/meta-oe/recipes-devtools/tcltk/tk-8.6.0/tkprivate.diff
@@ -0,0 +1,41 @@
+Patch by Chris Waters sets path which are normally point to a directory
+with Tk sources to a subdirectory of /usr/include/tcl8.4 (debian/rules
+puts private Tk headers there).
+
+--- tk8.5-8.5.8.orig/unix/tkConfig.sh.in
++++ tk8.5-8.5.8/unix/tkConfig.sh.in
+@@ -55,7 +55,7 @@
+ 
+ # String to pass to linker to pick up the Tk library from its
+ # build directory.
+-TK_BUILD_LIB_SPEC='@TK_BUILD_LIB_SPEC@'
++TK_BUILD_LIB_SPEC='@TK_LIB_SPEC@'
+ 
+ # String to pass to linker to pick up the Tk library from its
+ # installed directory.
+@@ -71,7 +71,7 @@
+ # different place than the directory containing the source files, this
+ # points to the location of the sources, not the location where Tk was
+ # compiled.
+-TK_SRC_DIR='@TK_SRC_DIR@'
++TK_SRC_DIR='@includedir@/tk-private'
+ 
+ # Needed if you want to make a 'fat' shared library library
+ # containing tk objects or link a different wish.
+@@ -86,14 +86,14 @@
+ 
+ # String to pass to linker to pick up the Tk stub library from its
+ # build directory.
+-TK_BUILD_STUB_LIB_SPEC='@TK_BUILD_STUB_LIB_SPEC@'
++TK_BUILD_STUB_LIB_SPEC='@TK_STUB_LIB_SPEC@'
+ 
+ # String to pass to linker to pick up the Tk stub library from its
+ # installed directory.
+ TK_STUB_LIB_SPEC='@TK_STUB_LIB_SPEC@'
+ 
+ # Path to the Tk stub library in the build directory.
+-TK_BUILD_STUB_LIB_PATH='@TK_BUILD_STUB_LIB_PATH@'
++TK_BUILD_STUB_LIB_PATH='@TK_STUB_LIB_PATH@'
+ 
+ # Path to the Tk stub library in the install directory.
+ TK_STUB_LIB_PATH='@TK_STUB_LIB_PATH@'
diff --git a/meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb b/meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb
new file mode 100644
index 0000000000..d12973cbe6
--- /dev/null
+++ b/meta-oe/recipes-devtools/tcltk/tk_8.6.0.bb
@@ -0,0 +1,54 @@
+SUMMARY = "Tool Command Language ToolKit Extension"
+HOMEPAGE = "http://tcl.sourceforge.net"
+SECTION = "devel/tcltk"
+LICENSE = "tcl"
+LIC_FILES_CHKSUM = "file://license.terms;md5=c88f99decec11afa967ad33d314f87fe"
+DEPENDS = "tcl virtual/libx11 libxt"
+
+SRC_URI = "\
+    ${SOURCEFORGE_MIRROR}/tcl/tk${PV}-src.tar.gz \
+    file://confsearch.diff;striplevel=2 \
+    file://non-linux.diff;striplevel=2 \
+    file://tklibrary.diff;striplevel=2 \
+    file://tkprivate.diff;striplevel=2 \
+    file://fix-xft.diff \
+"
+SRC_URI[md5sum] = "b883a1a3c489c17413fb602a94bf54e8"
+SRC_URI[sha256sum] = "5c708b2b6f658916df59190b27750fa1ea2bc10992108e10f961c0700f058de6"
+
+S = "${WORKDIR}/tk${PV}/unix"
+LDFLAGS += "-Wl,-rpath,${libdir}/tcltk/8.6.0/lib"
+inherit autotools
+
+EXTRA_OECONF = "\
+    --enable-threads \
+    --with-x \
+    --with-tcl=${STAGING_BINDIR_CROSS} \
+    --libdir=${libdir} \
+"
+
+do_install_append() {
+    ln -sf libtk8.6.so ${D}${libdir}/libtk8.6.so.0
+    oe_libinstall -so libtk8.6 ${D}${libdir}
+    ln -sf wish8.6 ${D}${bindir}/wish
+        
+    # Even after passing libdir=${libdir} at config, some incorrect dirs are still generated for the multilib build
+    if [ "$libdir" != "/usr/lib" ]; then
+        # Move files to correct library directory
+        mv ${D}/usr/lib/tk8.6/* ${D}/${libdir}/tk8.6/
+        # Remove unneeded/incorrect dir ('usr/lib/')
+        rm -rf ${D}/usr/lib
+    fi
+}
+
+PACKAGES =+ "${PN}-lib"
+
+FILES_${PN}-lib = "${libdir}/libtk8.6.so*"
+FILES_${PN} += "${libdir}/tk*"
+
+# isn't getting picked up by shlibs code
+RDEPENDS_${PN} += "tk-lib"
+RDEPENDS_${PN}_class-native = ""
+
+BINCONFIG_GLOB = "*Config.sh"
+BBCLASSEXTEND = "native"