From e8279f5164d38207f47c83223d8cc1d2068859d2 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 29 Aug 2011 11:49:56 +0200 Subject: fix segfault in java --- package/openjdk/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'package/openjdk') diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile index 4bb68bb88..81e057978 100644 --- a/package/openjdk/Makefile +++ b/package/openjdk/Makefile @@ -59,7 +59,9 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,OPENJDK,openjdk,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - +# segfaults with march=pentium-m/atom +TARGET_CFLAGS:= $(subst march=pentium-m,march=i686,$(TARGET_CFLAGS)) +TARGET_CFLAGS:= $(subst march=atom,march=i686,$(TARGET_CFLAGS)) TARGET_CFLAGS:= $(filter-out -fhonour-copts,$(TARGET_CFLAGS)) BOOTSTRAPJDK:= ${STAGING_JAVA_HOST_DIR}/bootstrap-jdk -- cgit v1.2.3 From 36197e445d0bde5785bb1a823b0e83c4f5b89ccb Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 29 Aug 2011 12:28:22 +0200 Subject: add runtime dependencies for AWT --- package/openjdk/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/openjdk') diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile index 81e057978..542d39ac4 100644 --- a/package/openjdk/Makefile +++ b/package/openjdk/Makefile @@ -17,7 +17,7 @@ PKG_DESCR:= OpenJDK Java VM PKG_SECTION:= lang PKG_BUILDDEP:= alsa-lib xproto jpeg zlib giflib libpng freetype cups PKG_BUILDDEP+= libX11 libXt libXp libXinerama libXrender libXtst libiconv -PKG_DEPENDS:= zlib libstdcxx libffi libpthread +PKG_DEPENDS:= zlib libstdcxx libffi libpthread libxtst libxi PKG_URL:= http://openjdk.org/ PKG_SITES:= http://download.java.net/openjdk/jdk6/promoted/b22/ \ http://mirror.netcologne.de/apache.org/xml/xalan-j/binaries/ \ -- cgit v1.2.3 From f3750e5770ec75eb8f9a62b72a278efc57da0341 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 30 Aug 2011 07:07:40 +0200 Subject: remove man pages --- package/openjdk/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'package/openjdk') diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile index 542d39ac4..ddc34cacb 100644 --- a/package/openjdk/Makefile +++ b/package/openjdk/Makefile @@ -146,5 +146,6 @@ pre-configure: openjdk-install: $(INSTALL_DIR) $(IDIR_OPENJDK)/usr $(CP) $(WRKBUILD)/openjdk.build/j2re-image/* $(IDIR_OPENJDK)/usr + rm -rf $(IDIR_OPENJDK)/usr/man include ${TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3