diff options
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/tcltk/tcl/no_packages.patch | 53 | ||||
-rw-r--r-- | meta/recipes-devtools/tcltk/tcl_8.6.11.bb | 5 |
2 files changed, 2 insertions, 56 deletions
diff --git a/meta/recipes-devtools/tcltk/tcl/no_packages.patch b/meta/recipes-devtools/tcltk/tcl/no_packages.patch deleted file mode 100644 index 5c622a2369..0000000000 --- a/meta/recipes-devtools/tcltk/tcl/no_packages.patch +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | tcl 8.6.0 builds by default a number of packages that are not needed in Yocto. | ||
2 | This patch changes the makefile so that these packages are not built by default. | ||
3 | |||
4 | Upstream-Status:Inappropriate [embedded specific] | ||
5 | |||
6 | Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com> | ||
7 | |||
8 | diff --git a/Makefile.in b/Makefile.in | ||
9 | index b729ffd..2c2e824 100644 | ||
10 | --- a/Makefile.in | ||
11 | +++ b/Makefile.in | ||
12 | @@ -612,7 +612,7 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $(UNIX_SRCS) $(NOTIFY_SRCS) \ | ||
13 | # Start of rules | ||
14 | #-------------------------------------------------------------------------- | ||
15 | |||
16 | -all: binaries libraries doc packages | ||
17 | +all: binaries libraries doc | ||
18 | |||
19 | binaries: ${LIB_FILE} ${TCL_EXE} | ||
20 | |||
21 | @@ -656,12 +656,12 @@ Makefile: $(UNIX_DIR)/Makefile.in $(DLTEST_DIR)/Makefile.in | ||
22 | #tclConfig.h: $(UNIX_DIR)/tclConfig.h.in | ||
23 | # $(SHELL) config.status | ||
24 | |||
25 | -clean: clean-packages | ||
26 | +clean: | ||
27 | rm -rf *.a *.o libtcl* core errs *~ \#* TAGS *.E a.out \ | ||
28 | errors ${TCL_EXE} ${TCLTEST_EXE} lib.exp Tcl @DTRACE_HDR@ | ||
29 | cd dltest ; $(MAKE) clean | ||
30 | |||
31 | -distclean: distclean-packages clean | ||
32 | +distclean: clean | ||
33 | rm -rf Makefile config.status config.cache config.log tclConfig.sh \ | ||
34 | tclConfig.h *.plist Tcl.framework tcl.pc | ||
35 | cd dltest ; $(MAKE) distclean | ||
36 | @@ -709,7 +709,7 @@ tcltest-real: | ||
37 | # tcltest, ie: | ||
38 | # % make test TESTFLAGS="-verbose bps -file fileName.test" | ||
39 | |||
40 | -test: test-tcl test-packages | ||
41 | +test: test-tcl | ||
42 | |||
43 | test-tcl: ${TCLTEST_EXE} | ||
44 | $(SHELL_ENV) ${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) | ||
45 | @@ -774,7 +774,7 @@ INSTALL_PACKAGE_TARGETS = install-packages | ||
46 | INSTALL_DEV_TARGETS = install-headers | ||
47 | INSTALL_EXTRA_TARGETS = @EXTRA_INSTALL@ | ||
48 | INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DOC_TARGETS) $(INSTALL_DEV_TARGETS) \ | ||
49 | - $(INSTALL_PACKAGE_TARGETS) $(INSTALL_EXTRA_TARGETS) | ||
50 | + $(INSTALL_EXTRA_TARGETS) | ||
51 | |||
52 | install: $(INSTALL_TARGETS) | ||
53 | |||
diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.11.bb b/meta/recipes-devtools/tcltk/tcl_8.6.11.bb index b2863f9a1f..722e4a0132 100644 --- a/meta/recipes-devtools/tcltk/tcl_8.6.11.bb +++ b/meta/recipes-devtools/tcltk/tcl_8.6.11.bb | |||
@@ -15,17 +15,16 @@ LIC_FILES_CHKSUM = "file://../license.terms;md5=058f6229798281bbcac4239c788cfa38 | |||
15 | 15 | ||
16 | DEPENDS = "tcl-native zlib" | 16 | DEPENDS = "tcl-native zlib" |
17 | 17 | ||
18 | BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/${BPN}${PV}-src.tar.gz \ | 18 | BASE_SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl-core${PV}-src.tar.gz \ |
19 | file://tcl-add-soname.patch" | 19 | file://tcl-add-soname.patch" |
20 | SRC_URI = "${BASE_SRC_URI} \ | 20 | SRC_URI = "${BASE_SRC_URI} \ |
21 | file://fix_non_native_build_issue.patch \ | 21 | file://fix_non_native_build_issue.patch \ |
22 | file://fix_issue_with_old_distro_glibc.patch \ | 22 | file://fix_issue_with_old_distro_glibc.patch \ |
23 | file://no_packages.patch \ | ||
24 | file://tcl-remove-hardcoded-install-path.patch \ | 23 | file://tcl-remove-hardcoded-install-path.patch \ |
25 | file://alter-includedir.patch \ | 24 | file://alter-includedir.patch \ |
26 | file://run-ptest \ | 25 | file://run-ptest \ |
27 | " | 26 | " |
28 | SRC_URI[sha256sum] = "8c0486668586672c5693d7d95817cb05a18c5ecca2f40e2836b9578064088258" | 27 | SRC_URI[sha256sum] = "cfb49aab82bd179651e23eeeb69606f51b0ddc575ca55c3d35e2457469024cfa" |
29 | 28 | ||
30 | SRC_URI_class-native = "${BASE_SRC_URI}" | 29 | SRC_URI_class-native = "${BASE_SRC_URI}" |
31 | 30 | ||