Browse Source

fix openjdk build errors for arm target

Waldemar Brodkorb 10 years ago
parent
commit
3cf55e2bc0
3 changed files with 6043 additions and 22 deletions
  1. 2 3
      package/libXt/Makefile
  2. 1 0
      package/openjdk7/Makefile
  3. 6040 19
      package/openjdk7/patches/openadk.patch

+ 2 - 3
package/libXt/Makefile

@@ -10,9 +10,9 @@ PKG_MD5SUM:=		7a80ed7aba06668b12ebd0910318a1f1
 PKG_DESCR:=		X Toolkit Intrinsics libraries
 PKG_SECTION:=		x11/libs
 PKG_DEPENDS:=		libsm libice libuuid libx11 libxau libxdmcp libxcb
-PKG_BUILDDEP:=		autotool util-macros-host libICE-host libSM-host
-PKG_BUILDDEP+=		libXt-host
+PKG_BUILDDEP:=		autotool
 PKG_BUILDDEP+=		libSM libX11 kbproto util-macros
+HOST_BUILDDEP:=		util-macros-host libICE-host libSM-host
 PKG_SITES:=		${MASTER_SITE_XORG}
 PKG_LIBNAME:=		libxt
 PKG_OPTS:=		dev
@@ -27,7 +27,6 @@ $(eval $(call PKG_template,LIBXT,libxt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPEN
 
 HOST_STYLE:=		auto
 AUTOTOOL_STYLE:=	autoreconf
-TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 CONFIGURE_ENV+=		CFLAGS_FOR_BUILD="$(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD)"
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 

+ 1 - 0
package/openjdk7/Makefile

@@ -102,6 +102,7 @@ OPENJDK_NATIVE_ENV:=	JAVACFLAGS="-cp ${STAGING_HOST_DIR}/usr/share/java/libgcj-$
 			BOOTCLASSPATH="$(STAGING_HOST_DIR)/usr/share/jamvm/classes.zip:$(STAGING_HOST_DIR)/usr/share/classpath/glibj.zip" \
 			FFI_LDFLAGS="$(LDFLAGS_FOR_BUILD)" \
 			OTHER_LDFLAGS='$(LDFLAGS_FOR_BUILD)' \
+			ALT_OPENWIN_HOME=$(STAGING_HOST_DIR)/usr/ \
 			ALT_CUPS_HEADERS_PATH="$(STAGING_HOST_DIR)/usr/include" \
 			ALT_FREETYPE_HEADERS_PATH="$(STAGING_HOST_DIR)/usr/include" \
 			ALT_FREETYPE_LIB_PATH="$(STAGING_HOST_DIR)/usr/lib" \

File diff suppressed because it is too large
+ 6040 - 19
package/openjdk7/patches/openadk.patch


Some files were not shown because too many files changed in this diff