diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-30 06:04:09 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-30 06:04:09 +0200 |
| commit | 9a71264445185841dee548eca87b2984fc198f1f (patch) | |
| tree | 9266734c5c22a99a64100c8b93242f0e494d86d0 /package/openjdk | |
| parent | 15ea15f2cff68851af19b0e74a7646eb0ce74002 (diff) | |
| parent | 36197e445d0bde5785bb1a823b0e83c4f5b89ccb (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/openjdk')
| -rw-r--r-- | package/openjdk/Makefile | 10 | ||||
| -rw-r--r-- | package/openjdk/patches/cxxflags-nozlib.patch | 31 |
2 files changed, 39 insertions, 2 deletions
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile index 347f3b01d..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/ \ @@ -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 @@ -98,7 +100,10 @@ CONFIGURE_ENV+= PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$${PATH}:${STAGING_TARGET MAKE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \ ADK_ECJ=$(STAGING_JAVA_HOST_DIR)/usr/bin/ecj \ PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$${PATH}:${STAGING_TARGET_DIR}/usr/bin \ + OTHER_CFLAGS='$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)' \ + OTHER_CXXFLAGS='$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS)' \ GCC_HONOUR_COPTS=s CROSS_COMPILE_ARCH=$(ARCH) + ALL_TARGET:= icedtea # add include path for Xrender.h from staging directory @@ -107,6 +112,7 @@ ifeq ($(QEMU),) $(error Fatal error: $$QEMU not set!) endif $(SED) "s#@ADK_TARGETDIR@#$(STAGING_TARGET_DIR)#" ${WRKDIST}/$(PKG_NAME)-$(PKG_VERSION)/jdk/make/sun/xawt/Makefile + $(SED) "s#OTHER_CXXFLAGS#CXXFLAGS_COMMON#" ${WRKDIST}/$(PKG_NAME)-$(PKG_VERSION)/jdk/make/com/sun/java/pack/Makefile do-extract: cd ${WRKDIST}; mkdir $(PKG_NAME)-$(PKG_VERSION); \ diff --git a/package/openjdk/patches/cxxflags-nozlib.patch b/package/openjdk/patches/cxxflags-nozlib.patch new file mode 100644 index 000000000..67812253a --- /dev/null +++ b/package/openjdk/patches/cxxflags-nozlib.patch @@ -0,0 +1,31 @@ +--- w-openjdk-6.orig/icedtea6-1.10/patches/libraries.patch 2011-02-23 23:32:34.602901049 +0100 ++++ w-openjdk-6/icedtea6-1.10/patches/libraries.patch 2011-08-24 15:07:24.347475241 +0200 +@@ -24648,7 +24648,7 @@ + - $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX) + - + - ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3 +-- OTHER_CXXFLAGS += $(ZINCLUDE) ++- CXXFLAGS_COMMON += $(ZINCLUDE) + - LDDFLAGS += $(ZIPOBJS) + + $(ZIPOBJDIR)/deflate.$(OBJECT_SUFFIX) \ + + $(ZIPOBJDIR)/trees.$(OBJECT_SUFFIX) \ +@@ -24663,7 +24663,7 @@ + + + + OTHER_LDLIBS += -lz + else +- OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI ++ CXXFLAGS_COMMON += -DNO_ZLIB -DUNPACK_JNI + - OTHER_LDLIBS += $(JVMLIB) + + OTHER_LDLIBS += -lz $(JVMLIB) + endif +--- w-openjdk-6.orig/icedtea6-1.10/patches/linker-libs-order.patch 2011-02-23 23:32:34.653236038 +0100 ++++ w-openjdk-6/icedtea6-1.10/patches/linker-libs-order.patch 2011-08-24 15:53:05.047474381 +0200 +@@ -31,7 +31,7 @@ + + - OTHER_LDLIBS += -lz + else +- OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI ++ CXXFLAGS_COMMON += -DNO_ZLIB -DUNPACK_JNI + - OTHER_LDLIBS += -lz $(JVMLIB) + + OTHER_LDLIBS += $(JVMLIB) + endif |