diff options
| -rw-r--r-- | package/jamvm/Makefile | 5 | ||||
| -rw-r--r-- | package/openjdk7/Makefile | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile index 5e35904ed..20d92138b 100644 --- a/package/jamvm/Makefile +++ b/package/jamvm/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= jamvm PKG_VERSION:= 1.5.4 PKG_RELEASE:= 4 PKG_MD5SUM:= 7654e9657691f5f09c4f481ed4686176 -PKG_DESCR:= A Java Virtual Machine (JVM) implementation +PKG_DESCR:= Java Virtual Machine (JVM) implementation PKG_SECTION:= lang PKG_DEPENDS:= libffi zlib PKG_BUILDDEP:= libffi zlib @@ -25,7 +25,8 @@ $(eval $(call HOST_template,JAMVM,jamvm,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,JAMVM,jamvm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) HOST_STYLE:= auto -HOST_CONFIGURE_ARGS+= --with-classpath-install-dir=$(STAGING_HOST_DIR)/usr +HOST_CONFIGURE_ARGS+= --libdir=$(STAGING_HOST_DIR)/usr/lib/jamvm \ + --with-classpath-install-dir=$(STAGING_HOST_DIR)/usr BUILD_STYLE:= manual INSTALL_STYLE:= manual diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile index 3101f53fa..5d314acab 100644 --- a/package/openjdk7/Makefile +++ b/package/openjdk7/Makefile @@ -107,6 +107,7 @@ OPENJDK_NATIVE_ENV+= LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_ OPENJDK_NATIVE_ENV+= ADK_ECJ=$(STAGING_HOST_DIR)/usr/bin/ecj OPENJDK_NATIVE_ENV+= BOOTCLASSPATH="$(STAGING_HOST_DIR)/usr/share/jamvm/classes.zip:$(STAGING_HOST_DIR)/usr/share/classpath/glibj.zip" OPENJDK_NATIVE_ENV+= FFI_LDFLAGS="$(LDFLAGS_FOR_BUILD)" \ + OTHER_LDFLAGS='$(LDFLAGS_FOR_BUILD)' \ ALT_CUPS_HEADERS_PATH="$(STAGING_HOST_DIR)/usr/include" \ ALT_FREETYPE_HEADERS_PATH="$(STAGING_HOST_DIR)/usr/include" \ ALT_FREETYPE_LIB_PATH="$(STAGING_HOST_DIR)/usr/lib" |