diff options
Diffstat (limited to 'meta/recipes-devtools/tcltk/tcl/alter-includedir.patch')
-rw-r--r-- | meta/recipes-devtools/tcltk/tcl/alter-includedir.patch | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch b/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch index 66c395d401..5b25af2c0c 100644 --- a/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch +++ b/meta/recipes-devtools/tcltk/tcl/alter-includedir.patch | |||
@@ -18,8 +18,8 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | |||
18 | 18 | ||
19 | diff --git a/Makefile.in b/Makefile.in | 19 | diff --git a/Makefile.in b/Makefile.in |
20 | index 0370491..daa569a 100644 | 20 | index 0370491..daa569a 100644 |
21 | --- a/Makefile.in | 21 | --- a/unix/Makefile.in |
22 | +++ b/Makefile.in | 22 | +++ b/unix/Makefile.in |
23 | @@ -57,7 +57,7 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY) | 23 | @@ -57,7 +57,7 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY) |
24 | MODULE_INSTALL_DIR = $(SCRIPT_INSTALL_DIR)/../tcl8 | 24 | MODULE_INSTALL_DIR = $(SCRIPT_INSTALL_DIR)/../tcl8 |
25 | 25 | ||
@@ -29,32 +29,10 @@ index 0370491..daa569a 100644 | |||
29 | 29 | ||
30 | # Path to the private tcl header dir: | 30 | # Path to the private tcl header dir: |
31 | PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ | 31 | PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ |
32 | diff --git a/configure b/configure | ||
33 | index 181b9b3..f4cc225 100755 | ||
34 | --- a/configure | ||
35 | +++ b/configure | ||
36 | @@ -10166,7 +10166,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" | ||
37 | eval "TCL_LIB_FILE=${TCL_LIB_FILE}" | ||
38 | |||
39 | test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)' | ||
40 | -PRIVATE_INCLUDE_DIR='$(includedir)' | ||
41 | +PRIVATE_INCLUDE_DIR='$(includedir)/tcl$(VERSION)' | ||
42 | HTML_DIR='$(DISTDIR)/html' | ||
43 | |||
44 | # Note: in the following variable, it's important to use the absolute | ||
45 | @@ -10323,7 +10323,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}" | ||
46 | TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}" | ||
47 | |||
48 | # Install time header dir can be set via --includedir | ||
49 | -eval "TCL_INCLUDE_SPEC=\"-I${includedir}\"" | ||
50 | +eval "TCL_INCLUDE_SPEC=\"-I${includedir}/tcl${VERSION}\"" | ||
51 | |||
52 | #------------------------------------------------------------------------ | ||
53 | # tclConfig.sh refers to this by a different name | ||
54 | diff --git a/configure.in b/configure.in | 32 | diff --git a/configure.in b/configure.in |
55 | index 9f96e2b..e323e02 100644 | 33 | index 9f96e2b..e323e02 100644 |
56 | --- a/configure.in | 34 | --- a/unix/configure.in |
57 | +++ b/configure.in | 35 | +++ b/unix/configure.in |
58 | @@ -773,7 +773,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" | 36 | @@ -773,7 +773,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" |
59 | eval "TCL_LIB_FILE=${TCL_LIB_FILE}" | 37 | eval "TCL_LIB_FILE=${TCL_LIB_FILE}" |
60 | 38 | ||