diff options
-rw-r--r-- | recipes-core/classpath/classpath-0.99/use_libdir.patch | 19 | ||||
-rw-r--r-- | recipes-core/classpath/classpath.inc | 2 | ||||
-rw-r--r-- | recipes-core/classpath/classpath_0.99.bb | 1 |
3 files changed, 21 insertions, 1 deletions
diff --git a/recipes-core/classpath/classpath-0.99/use_libdir.patch b/recipes-core/classpath/classpath-0.99/use_libdir.patch new file mode 100644 index 0000000..3b4df90 --- /dev/null +++ b/recipes-core/classpath/classpath-0.99/use_libdir.patch | |||
@@ -0,0 +1,19 @@ | |||
1 | on some arches we use lib64 for libdir so hardcoding to lib | ||
2 | is not gonna work always | ||
3 | |||
4 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
5 | |||
6 | Index: classpath-0.99/resource/Makefile.am | ||
7 | =================================================================== | ||
8 | --- classpath-0.99.orig/resource/Makefile.am 2006-01-12 12:15:43.000000000 -0800 | ||
9 | +++ classpath-0.99/resource/Makefile.am 2012-11-21 14:28:02.433005139 -0800 | ||
10 | @@ -1,7 +1,7 @@ | ||
11 | ## used by automake to generate Makefile.in | ||
12 | |||
13 | logging_DATA = java/util/logging/logging.properties | ||
14 | -loggingdir = $(prefix)/lib | ||
15 | +loggingdir = $(libdir) | ||
16 | |||
17 | security_DATA = java/security/classpath.security | ||
18 | -securitydir = $(prefix)/lib/security | ||
19 | +securitydir = $(libdir)/security | ||
diff --git a/recipes-core/classpath/classpath.inc b/recipes-core/classpath/classpath.inc index 1a8093e..214c9cd 100644 --- a/recipes-core/classpath/classpath.inc +++ b/recipes-core/classpath/classpath.inc | |||
@@ -21,7 +21,7 @@ RPROVIDES_${PN} = "${PBN}" | |||
21 | RPROVIDES_${PN}-common = "${PBN}-common" | 21 | RPROVIDES_${PN}-common = "${PBN}-common" |
22 | RPROVIDES_${PN}-gtk = "${PBN}-awt" | 22 | RPROVIDES_${PN}-gtk = "${PBN}-awt" |
23 | 23 | ||
24 | PR = "r1" | 24 | PR = "r2" |
25 | 25 | ||
26 | SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz" | 26 | SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz" |
27 | 27 | ||
diff --git a/recipes-core/classpath/classpath_0.99.bb b/recipes-core/classpath/classpath_0.99.bb index ee38992..7839519 100644 --- a/recipes-core/classpath/classpath_0.99.bb +++ b/recipes-core/classpath/classpath_0.99.bb | |||
@@ -8,6 +8,7 @@ SRC_URI += " \ | |||
8 | file://autotools.patch \ | 8 | file://autotools.patch \ |
9 | file://miscompilation.patch \ | 9 | file://miscompilation.patch \ |
10 | file://toolwrapper-exithook.patch \ | 10 | file://toolwrapper-exithook.patch \ |
11 | file://use_libdir.patch \ | ||
11 | " | 12 | " |
12 | 13 | ||
13 | SRC_URI[md5sum] = "0ae1571249172acd82488724a3b8acb4" | 14 | SRC_URI[md5sum] = "0ae1571249172acd82488724a3b8acb4" |