diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-12-28 17:30:36 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-12-28 17:30:36 +0100 |
| commit | 89551d9a7633d83d45fb22316153dee7cd898fbc (patch) | |
| tree | fe55cf46df70e534a912831f3288bd9b2400835f /package/jamvm | |
| parent | 320e16528ea6a9eba54bac0161e2331093075647 (diff) | |
| parent | 7051ba973da28f456659ced479c731a61a624a85 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/jamvm')
| -rw-r--r-- | package/jamvm/Makefile | 2 | ||||
| -rw-r--r-- | package/jamvm/patches/patch-src_os_linux_os_c | 17 |
2 files changed, 18 insertions, 1 deletions
diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile index 44d160ee1..6cca7f5d8 100644 --- a/package/jamvm/Makefile +++ b/package/jamvm/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= jamvm PKG_VERSION:= 1.5.4 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 7654e9657691f5f09c4f481ed4686176 PKG_DESCR:= A Java Virtual Machine (JVM) implementation PKG_SECTION:= lang diff --git a/package/jamvm/patches/patch-src_os_linux_os_c b/package/jamvm/patches/patch-src_os_linux_os_c new file mode 100644 index 000000000..a867841e3 --- /dev/null +++ b/package/jamvm/patches/patch-src_os_linux_os_c @@ -0,0 +1,17 @@ +--- jamvm-1.5.4.orig/src/os/linux/os.c 2009-12-31 19:40:48.000000000 +0100 ++++ jamvm-1.5.4/src/os/linux/os.c 2013-12-25 16:43:03.000000000 +0100 +@@ -46,10 +46,12 @@ void *nativeStackBase() { + } + + int nativeAvailableProcessors() { +-#ifdef __UCLIBC__ ++#if defined(__UCLIBC__) + return 1; +-#else ++#elif defined(__GLIBC__) + return get_nprocs(); ++#else ++ return 1; + #endif + } + |