diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-05 11:53:26 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-05 11:53:26 +0200 |
| commit | 4a54d9dd804bc3b64703ba04060ec8c48a8c9811 (patch) | |
| tree | 948f1b2bead3d128603ad5a34609205db61da3aa /package/openjdk | |
| parent | e61aad237ecb819635bb7550dbbf66f2b8817b50 (diff) | |
| parent | 40c2b2f6a83e9cca14567e855fc75a8d1ef78f28 (diff) | |
resolve conflict
Diffstat (limited to 'package/openjdk')
| -rw-r--r-- | package/openjdk/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile index e2bff393d..2c953c0fe 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/ \ @@ -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 @@ -144,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 |