diff options
Diffstat (limited to 'package/java')
| -rw-r--r-- | package/java/classpath/classpath.mk | 13 | ||||
| -rw-r--r-- | package/java/jamvm/jamvm.mk | 15 |
2 files changed, 8 insertions, 20 deletions
diff --git a/package/java/classpath/classpath.mk b/package/java/classpath/classpath.mk index ace57ddf9..02f2fbeb7 100644 --- a/package/java/classpath/classpath.mk +++ b/package/java/classpath/classpath.mk @@ -29,7 +29,7 @@ CLASSPATH_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \ ac_cv_func_strerror_r_char_p=no jm_cv_func_svid_putenv=yes \ ac_cv_func_getcwd_null=yes ac_cv_func_getdelim=yes \ ac_cv_func_mkstemp=yes utils_cv_func_mkstemp_limitations=no \ - utils_cv_func_mkdir_trailing_slash_bug=no ac_cv_func_memcmp_working=yes \ + utils_cv_func_mkdir_trailing_slash_bug=no \ ac_cv_have_decl_malloc=yes gl_cv_func_malloc_0_nonnull=yes \ ac_cv_func_malloc_0_nonnull=yes ac_cv_func_calloc_0_nonnull=yes \ ac_cv_func_realloc_0_nonnull=yes jm_cv_func_gettimeofday_clobber=no \ @@ -45,17 +45,12 @@ CLASSPATH_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \ ac_cv_prog_F77=no ac_cv_prog_CXX=no ac_cv_path_CUPS_CONFIG=no -CLASSPATH_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) --prefix=/usr \ - --exec-prefix=/usr --bindir=/usr/bin \ - --sbindir=/usr/sbin --libdir=/usr/lib \ - --libexecdir=/usr/lib --sysconfdir=/etc \ - --datadir=/usr/share --localstatedir=/var \ - --includedir=/usr/include --mandir=/usr/man \ +CLASSPATH_CONF_OPT = \ + --libexecdir=/usr/lib --localstatedir=/var --mandir=/usr/man \ --infodir=/usr/info --enable-shared \ --enable-static \ --disable-glibtest --enable-explicit-deps=no \ - --disable-debug PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ + --disable-debug \ --disable-gconf-peer --disable-examples --disable-plugin CLASSPATH_DEPENDENCIES = uclibc pkgconfig png jpeg tiff diff --git a/package/java/jamvm/jamvm.mk b/package/java/jamvm/jamvm.mk index c79c31d89..869b38be2 100644 --- a/package/java/jamvm/jamvm.mk +++ b/package/java/jamvm/jamvm.mk @@ -9,7 +9,6 @@ JAMVM_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/jam JAMVM_AUTORECONF = NO JAMVM_INSTALL_STAGING = YES JAMVM_INSTALL_TARGET = YES -JAMVM_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install JAMVM_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install JAMVM_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \ @@ -28,7 +27,7 @@ JAMVM_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \ ac_cv_func_strerror_r_char_p=no jm_cv_func_svid_putenv=yes \ ac_cv_func_getcwd_null=yes ac_cv_func_getdelim=yes \ ac_cv_func_mkstemp=yes utils_cv_func_mkstemp_limitations=no \ - utils_cv_func_mkdir_trailing_slash_bug=no ac_cv_func_memcmp_working=yes \ + utils_cv_func_mkdir_trailing_slash_bug=no \ ac_cv_have_decl_malloc=yes gl_cv_func_malloc_0_nonnull=yes \ ac_cv_func_malloc_0_nonnull=yes ac_cv_func_calloc_0_nonnull=yes \ ac_cv_func_realloc_0_nonnull=yes jm_cv_func_gettimeofday_clobber=no \ @@ -43,18 +42,12 @@ JAMVM_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \ ac_cv_path_GLIB_GENMARSHAL=/usr/bin/glib-genmarshal \ ac_cv_prog_F77=no ac_cv_prog_CXX=no ac_cv_path_CUPS_CONFIG=no -JAMVM_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) --prefix=/usr \ - --exec-prefix=/usr --bindir=/usr/bin \ - --sbindir=/usr/sbin --libdir=/usr/lib \ - --libexecdir=/usr/lib --sysconfdir=/etc \ - --datadir=/usr/share --localstatedir=/var \ - --includedir=/usr/include --mandir=/usr/man \ +JAMVM_CONF_OPT = \ + --libexecdir=/usr/lib --localstatedir=/var --mandir=/usr/man \ --infodir=/usr/info --enable-shared \ --enable-static \ --disable-glibtest --enable-explicit-deps=no \ - --disable-debug PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ - --with-classpath-install-dir=/usr \ + --disable-debug --with-classpath-install-dir=/usr JAMVM_DEPENDENCIES = uclibc pkgconfig classpath |