diff options
author | Hugo Vasconcelos Saldanha <hugo.saldanha@aker.com.br> | 2015-03-31 13:39:59 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2015-03-31 13:48:09 -0300 |
commit | 6d8dc1af442559380b2e247984961ba6609b6052 (patch) | |
tree | 8980fd07a7c82c4c4da6056e4ac52893d26ed4b9 | |
parent | 458f78f923d0a8bbfb4e2b98c708a3d9acd70949 (diff) | |
download | meta-java-6d8dc1af442559380b2e247984961ba6609b6052.tar.gz |
cacao: fix problem with internal garbage collector
Cacao uses an internal version of bdwgc that was being installed
(headers, libs, etc.) together with the JVM, unnecessarily conflicting
with original bdwgc package.
A patch from Gentoo is applied so the system's bdwgc is used instead.
Signed-off-by: Hugo Vasconcelos Saldanha <hugo.saldanha@aker.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r-- | recipes-core/cacao/cacao-1.6.1/system-boehm-gc.patch | 60 | ||||
-rw-r--r-- | recipes-core/cacao/cacao_1.6.1.bb | 8 |
2 files changed, 64 insertions, 4 deletions
diff --git a/recipes-core/cacao/cacao-1.6.1/system-boehm-gc.patch b/recipes-core/cacao/cacao-1.6.1/system-boehm-gc.patch new file mode 100644 index 0000000..c30f5be --- /dev/null +++ b/recipes-core/cacao/cacao-1.6.1/system-boehm-gc.patch | |||
@@ -0,0 +1,60 @@ | |||
1 | cacao: use system's boehm garbage collector | ||
2 | |||
3 | This is a Gentoo's patch [1] to force the use of system's bdwgc. | ||
4 | |||
5 | Cacao was installing an internal version of bdwgc which conflicts | ||
6 | with the system's version. | ||
7 | |||
8 | [1] https://gitweb.gentoo.org/proj/java.git/plain/dev-java/cacao/files/system-boehm-gc.patch | ||
9 | |||
10 | Upstream-Status: Inappropriate [not author] | ||
11 | |||
12 | Signed-off-by: Hugo Vasconcelos Saldanha <hugo.saldanha@aker.com.br> | ||
13 | |||
14 | diff --git a/configure.ac b/configure.ac | ||
15 | --- a/configure.ac | ||
16 | +++ b/configure.ac | ||
17 | @@ -691,6 +691,8 @@ | ||
18 | |||
19 | AC_CHECK_ENABLE_PIC_ASM | ||
20 | |||
21 | +PKG_CHECK_MODULES([BOEHM], bdw-gc,,AC_MSG_ERROR[boehm-gc not found]) | ||
22 | + | ||
23 | dnl Define version numbers. | ||
24 | AC_VERSION_DETAIL | ||
25 | AC_VERSION_CONFIG | ||
26 | @@ -793,12 +795,6 @@ | ||
27 | ) | ||
28 | |||
29 | |||
30 | -dnl We only build the shared library objects but we use it as | ||
31 | -dnl noinst_LTLIBRARIES. | ||
32 | -ac_configure_args="$ac_configure_args --disable-static" | ||
33 | -AC_CONFIG_SUBDIRS(src/mm/boehm-gc) | ||
34 | - | ||
35 | - | ||
36 | AC_OUTPUT | ||
37 | |||
38 | |||
39 | diff --git a/src/mm/Makefile.am b/src/mm/Makefile.am | ||
40 | --- a/src/mm/Makefile.am | ||
41 | +++ b/src/mm/Makefile.am | ||
42 | @@ -35,14 +35,13 @@ | ||
43 | endif | ||
44 | |||
45 | if ENABLE_GC_BOEHM | ||
46 | -SUBDIRS = \ | ||
47 | - boehm-gc | ||
48 | - | ||
49 | GC_FILE = \ | ||
50 | gc-boehm.cpp | ||
51 | |||
52 | -GC_LIB = \ | ||
53 | - $(top_builddir)/src/mm/boehm-gc/libgc.la | ||
54 | +AM_CPPFLAGS += $(BOEHM_CFLAGS) | ||
55 | + | ||
56 | +GC_LIB = $(BOEHM_LIBS) | ||
57 | + | ||
58 | endif | ||
59 | |||
60 | if ENABLE_GC_CACAO | ||
diff --git a/recipes-core/cacao/cacao_1.6.1.bb b/recipes-core/cacao/cacao_1.6.1.bb index 9f07946..65aaf93 100644 --- a/recipes-core/cacao/cacao_1.6.1.bb +++ b/recipes-core/cacao/cacao_1.6.1.bb | |||
@@ -4,14 +4,14 @@ LICENSE = "GPL-2.0" | |||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" |
5 | SECTION = "interpreters" | 5 | SECTION = "interpreters" |
6 | 6 | ||
7 | DEPENDS_class-native = "zlib-native libtool-native ecj-initial-native fastjar-native classpath-native" | 7 | DEPENDS_class-native = "zlib-native libtool-native ecj-initial-native fastjar-native classpath-native bdwgc-native" |
8 | PROVIDES_class-native = "virtual/java-native" | 8 | PROVIDES_class-native = "virtual/java-native" |
9 | 9 | ||
10 | DEPENDS = "zlib libtool classpath virtual/javac-native" | 10 | DEPENDS = "zlib libtool classpath virtual/javac-native bdwgc" |
11 | DEPENDS_${PN} = "classpath" | ||
12 | RPROVIDES_${PN} = "java2-runtime" | 11 | RPROVIDES_${PN} = "java2-runtime" |
13 | 12 | ||
14 | SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.xz" | 13 | SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.xz \ |
14 | file://system-boehm-gc.patch" | ||
15 | SRC_URI[md5sum] = "2c18478404afd1cffdd15ad1e9d85a57" | 15 | SRC_URI[md5sum] = "2c18478404afd1cffdd15ad1e9d85a57" |
16 | SRC_URI[sha256sum] = "eecc8bd1b528a028f43d9d1d0c06b97855bbf1d40e03826d911ebbc0b6971e12" | 16 | SRC_URI[sha256sum] = "eecc8bd1b528a028f43d9d1d0c06b97855bbf1d40e03826d911ebbc0b6971e12" |
17 | 17 | ||