[OE-core] [PATCH 1/2] tcl: Install header into 8.6 instead of PN-PV in user/include
This helps in compiling other programs like expect which
depend on private headers but 8.5, 8.6 and so on is enough
granularity and currently we had 8.6.x and so on which
means that expect recipe will need to be touched whenever there
is minor update of tcl.
Additionally the encode creating symlink to shared object in
patch and remove it from recipe
Refresh patches after making changes to Configure.in we
propertly generate configure and not patch is directly as
was the case.
Signed-off-by: Khem Raj raj.k...@gmail.com
---
.../tcltk/tcl/alter-includedir.patch | 39 +
.../tcl/fix_issue_with_old_distro_glibc.patch | 12 ++--
.../tcltk/tcl/fix_non_native_build_issue.patch | 12 ++--
meta/recipes-devtools/tcltk/tcl/no_packages.patch | 16 +++---
.../tcltk/tcl/tcl-add-soname.patch | 64 ++
.../tcl/tcl-remove-hardcoded-install-path.patch| 26 ++---
meta/recipes-devtools/tcltk/tcl_8.6.1.bb | 26 +
7 files changed, 120 insertions(+), 75 deletions(-)
create mode 100644 meta/recipes-devtools/tcltk/tcl/alter-includedir.patch
diff --git a/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch
b/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch
new file mode 100644
index 000..32e63c0
--- /dev/null
+++ b/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch
@@ -0,0 +1,39 @@
+Index: unix/Makefile.in
+===
+--- unix.orig/Makefile.in 2013-11-11 01:00:36.431550403 -0800
unix/Makefile.in 2013-11-11 01:05:09.587557282 -0800
+@@ -53,7 +53,7 @@
+ SCRIPT_INSTALL_DIR= $(INSTALL_ROOT)$(TCL_LIBRARY)
+
+ # Directory in which to install the include file tcl.h:
+-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)
++INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/tcl$(VERSION)
+
+ # Path to the private tcl header dir:
+ PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@
+Index: unix/configure.in
+===
+--- unix.orig/configure.in 2013-11-11 01:00:36.467550403 -0800
unix/configure.in 2013-11-11 01:00:36.503550404 -0800
+@@ -791,7 +791,7 @@
+ eval TCL_LIB_FILE=${TCL_LIB_FILE}
+
+ TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
+-PRIVATE_INCLUDE_DIR='$(includedir)'
++PRIVATE_INCLUDE_DIR='$(includedir)/tcl$(VERSION)'
+ HTML_DIR='$(DISTDIR)/html'
+
+ # Note: in the following variable, it's important to use the absolute
+Index: unix/configure
+===
+--- unix.orig/configure2013-11-11 01:00:36.467550403 -0800
unix/configure 2013-11-11 01:00:36.503550404 -0800
+@@ -19134,7 +19134,7 @@
+ eval TCL_LIB_FILE=${TCL_LIB_FILE}
+
+ TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
+-PRIVATE_INCLUDE_DIR='$(includedir)'
++PRIVATE_INCLUDE_DIR='$(includedir)/tcl$(VERSION)'
+ HTML_DIR='$(DISTDIR)/html'
+
+ # Note: in the following variable, it's important to use the absolute
diff --git
a/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch
b/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch
index ed58175..be27341 100644
--- a/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch
+++ b/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch
@@ -15,11 +15,11 @@ Fixes tcl target recipe build on old distros which have
glibc older than 2.14
Signed-Off-By: Nitin A Kamble nitin.a.kam...@intel.com
2012/04/26
-diff --git unix.orig/Makefile.in unix/Makefile.in
-index 571d53f..16351f6 100644
unix.orig/Makefile.in
-+++ unix/Makefile.in
-@@ -679,7 +679,7 @@ topDirName:
+Index: unix/Makefile.in
+===
+--- unix.orig/Makefile.in 2013-11-10 23:38:01.787425628 -0800
unix/Makefile.in 2013-11-10 23:37:59.807425578 -0800
+@@ -686,7 +686,7 @@
# tcltest executable gets the build directory burned into its ld search path.
# This keeps tcltest from picking up an already installed version of the Tcl
# library.
@@ -28,7 +28,7 @@ index 571d53f..16351f6 100644
TCLLIBPATH=@abs_builddir@/pkgs \
TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}
-@@ -705,7 +705,7 @@ test-tcl: ${TCLTEST_EXE}
+@@ -712,7 +712,7 @@
$(SHELL_ENV) ${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl $(TESTFLAGS)
gdb-test: ${TCLTEST_EXE}
diff --git a/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch
b/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch
index 80d718c..c60eb75 100644
--- a/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch
+++ b/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch
@@ -1,10 +1,10 @@
Upstream-Status: Pending
-diff --git unix.orig/Makefile.in unix/Makefile.in
-index df05759..571d53f 100644
unix.orig/Makefile.in
-+++ unix/Makefile.in
-@@ -702,23 +702,23 @@ tcltest-real:
+Index: unix/Makefile.in
Re: [OE-core] [PATCH 1/2] tcl: Install header into 8.6 instead of PN-PV in user/include
On 11/11/2013 01:23 AM, Khem Raj wrote:
This helps in compiling other programs like expect which
depend on private headers but 8.5, 8.6 and so on is enough
granularity and currently we had 8.6.x and so on which
means that expect recipe will need to be touched whenever there
is minor update of tcl.
Additionally the encode creating symlink to shared object in
patch and remove it from recipe
Refresh patches after making changes to Configure.in we
propertly generate configure and not patch is directly as
was the case.
Signed-off-by: Khem Raj raj.k...@gmail.com
---
.../tcltk/tcl/alter-includedir.patch | 39 +
.../tcl/fix_issue_with_old_distro_glibc.patch | 12 ++--
.../tcltk/tcl/fix_non_native_build_issue.patch | 12 ++--
meta/recipes-devtools/tcltk/tcl/no_packages.patch | 16 +++---
.../tcltk/tcl/tcl-add-soname.patch | 64 ++
.../tcl/tcl-remove-hardcoded-install-path.patch| 26 ++---
meta/recipes-devtools/tcltk/tcl_8.6.1.bb | 26 +
7 files changed, 120 insertions(+), 75 deletions(-)
create mode 100644 meta/recipes-devtools/tcltk/tcl/alter-includedir.patch
diff --git a/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch
b/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch
new file mode 100644
index 000..32e63c0
--- /dev/null
+++ b/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch
New patch needs header please.
Thanks
Sau!
@@ -0,0 +1,39 @@
+Index: unix/Makefile.in
+===
+--- unix.orig/Makefile.in 2013-11-11 01:00:36.431550403 -0800
unix/Makefile.in 2013-11-11 01:05:09.587557282 -0800
+@@ -53,7 +53,7 @@
+ SCRIPT_INSTALL_DIR= $(INSTALL_ROOT)$(TCL_LIBRARY)
+
+ # Directory in which to install the include file tcl.h:
+-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)
++INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/tcl$(VERSION)
+
+ # Path to the private tcl header dir:
+ PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@
+Index: unix/configure.in
+===
+--- unix.orig/configure.in 2013-11-11 01:00:36.467550403 -0800
unix/configure.in 2013-11-11 01:00:36.503550404 -0800
+@@ -791,7 +791,7 @@
+ eval TCL_LIB_FILE=${TCL_LIB_FILE}
+
+ TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
+-PRIVATE_INCLUDE_DIR='$(includedir)'
++PRIVATE_INCLUDE_DIR='$(includedir)/tcl$(VERSION)'
+ HTML_DIR='$(DISTDIR)/html'
+
+ # Note: in the following variable, it's important to use the absolute
+Index: unix/configure
+===
+--- unix.orig/configure2013-11-11 01:00:36.467550403 -0800
unix/configure 2013-11-11 01:00:36.503550404 -0800
+@@ -19134,7 +19134,7 @@
+ eval TCL_LIB_FILE=${TCL_LIB_FILE}
+
+ TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
+-PRIVATE_INCLUDE_DIR='$(includedir)'
++PRIVATE_INCLUDE_DIR='$(includedir)/tcl$(VERSION)'
+ HTML_DIR='$(DISTDIR)/html'
+
+ # Note: in the following variable, it's important to use the absolute
diff --git
a/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch
b/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch
index ed58175..be27341 100644
--- a/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch
+++ b/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch
@@ -15,11 +15,11 @@ Fixes tcl target recipe build on old distros which have
glibc older than 2.14
Signed-Off-By: Nitin A Kamble nitin.a.kam...@intel.com
2012/04/26
-diff --git unix.orig/Makefile.in unix/Makefile.in
-index 571d53f..16351f6 100644
unix.orig/Makefile.in
-+++ unix/Makefile.in
-@@ -679,7 +679,7 @@ topDirName:
+Index: unix/Makefile.in
+===
+--- unix.orig/Makefile.in 2013-11-10 23:38:01.787425628 -0800
unix/Makefile.in 2013-11-10 23:37:59.807425578 -0800
+@@ -686,7 +686,7 @@
# tcltest executable gets the build directory burned into its ld search path.
# This keeps tcltest from picking up an already installed version of the Tcl
# library.
@@ -28,7 +28,7 @@ index 571d53f..16351f6 100644
TCLLIBPATH=@abs_builddir@/pkgs \
TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}
-@@ -705,7 +705,7 @@ test-tcl: ${TCLTEST_EXE}
+@@ -712,7 +712,7 @@
$(SHELL_ENV) ${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl $(TESTFLAGS)
gdb-test: ${TCLTEST_EXE}
diff --git a/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch
b/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch
index 80d718c..c60eb75 100644
--- a/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch
+++ b/meta/recipes-devtools/tcltk/tcl/fix_non_native_build_issue.patch
@@ -1,10 +1,10 @@
Upstream-Status: Pending
-diff --git unix.orig/Makefile.in unix/Makefile.in
-index df05759..571d53f 100644
unix.orig/Makefile.in
-+++
Re: [OE-core] [PATCH 1/2] tcl: Install header into 8.6 instead of PN-PV in user/include
On Mon, Nov 11, 2013 at 7:28 PM, Saul Wold s...@linux.intel.com wrote: On 11/11/2013 01:23 AM, Khem Raj wrote: This helps in compiling other programs like expect which depend on private headers but 8.5, 8.6 and so on is enough granularity and currently we had 8.6.x and so on which means that expect recipe will need to be touched whenever there is minor update of tcl. Additionally the encode creating symlink to shared object in patch and remove it from recipe Refresh patches after making changes to Configure.in we propertly generate configure and not patch is directly as was the case. Signed-off-by: Khem Raj raj.k...@gmail.com --- .../tcltk/tcl/alter-includedir.patch | 39 + .../tcl/fix_issue_with_old_distro_glibc.patch | 12 ++-- .../tcltk/tcl/fix_non_native_build_issue.patch | 12 ++-- meta/recipes-devtools/tcltk/tcl/no_packages.patch | 16 +++--- .../tcltk/tcl/tcl-add-soname.patch | 64 ++ .../tcl/tcl-remove-hardcoded-install-path.patch| 26 ++--- meta/recipes-devtools/tcltk/tcl_8.6.1.bb | 26 + 7 files changed, 120 insertions(+), 75 deletions(-) create mode 100644 meta/recipes-devtools/tcltk/tcl/alter-includedir.patch diff --git a/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch b/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch new file mode 100644 index 000..32e63c0 --- /dev/null +++ b/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch New patch needs header please. sent a V2 just now ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
