Преглед на файлове

apparently, fastjar is also broken ⇒ use zip/unzip

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
Thorsten Glaser преди 13 години
родител
ревизия
a6d93f95b9
променени са 1 файла, в които са добавени 1 реда и са изтрити 3 реда
  1. 1 3
      jtools/gcj/Makefile

+ 1 - 3
jtools/gcj/Makefile

@@ -14,8 +14,7 @@ WRKDIST=		${WRKDIR}/gcc-${PKG_VERSION}
 
 
 include ../rules.mk
 include ../rules.mk
 
 
-GCJ_ENV+=		ac_cv_prog_JAR=$(STAGING_JAVA_HOST_DIR)/usr/bin/fastjar
-GCJ_ENV+=		JAR=$(STAGING_JAVA_HOST_DIR)/usr/bin/fastjar
+GCJ_ENV+=		JAR=no
 
 
 install: ${STAGING_JAVA_HOST_DIR}/usr/bin/gcj
 install: ${STAGING_JAVA_HOST_DIR}/usr/bin/gcj
 
 
@@ -30,7 +29,6 @@ $(WRKBUILD)/.configured: ${WRKDIST}/.prepared
 			--with-mpc=$(STAGING_HOST_DIR) \
 			--with-mpc=$(STAGING_HOST_DIR) \
 			--with-mpfr=$(STAGING_HOST_DIR) \
 			--with-mpfr=$(STAGING_HOST_DIR) \
 			--with-gmp=$(STAGING_HOST_DIR) \
 			--with-gmp=$(STAGING_HOST_DIR) \
-			--with-jar=$(STAGING_JAVA_HOST_DIR)/usr/bin/fastjar \
 			--disable-libmudflap \
 			--disable-libmudflap \
 			--disable-libgomp \
 			--disable-libgomp \
 			--disable-biarch \
 			--disable-biarch \