resolve conflict

5 files changed, 14 insertions, 14 deletions

diff --git a/package/libmad/Makefile b/package/libmad/Makefile
index 0b708732d..58faf3463 100644
--- a/package/libmad/Makefile
+++ b/package/libmad/Makefile
@@ -21,6 +21,9 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LIBMAD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBMAD_DEV,libmad-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBMAD_DEV},${PKGSC_LIBMAD_DEV}))
 
+#FIXME
+XAKE_FLAGS+=             GCC_HONOUR_COPTS=s
+
 FPM:=default
 ifeq (${ARCH},i386)
 FPM:=intel
diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile
index de0d75403..c14dc6c43 100644
--- a/package/libpthread/Makefile
+++ b/package/libpthread/Makefile
@@ -24,8 +24,7 @@ PKG_OPTS:=		noremove
 
 NO_DISTFILES:=		1
 
-PKG_SUBPKGS:=		LIBPTHREAD LIBPTHREAD_DEV
-PKGSC_LIBPTHREAD_DEV:=	devel
+PKG_SUBPKGS:=		LIBPTHREAD
 
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS+=		libonly
@@ -34,7 +33,6 @@ endif
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBPTHREAD,libpthread,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBPTHREAD_DEV,libpthread-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBPTHREAD_DEV},${PKG_OPTS}))
 
 CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
@@ -46,11 +44,4 @@ ifeq ($(ADK_NATIVE),)
 	${CP} ${STAGING_TARGET_DIR}/lib/libpthread*.so* ${IDIR_LIBPTHREAD}/lib
 endif
 
-libpthread-dev-install:
-ifeq ($(ADK_NATIVE),)
-	${INSTALL_DIR} ${IDIR_LIBPTHREAD_DEV}/usr/lib
-	-${CP} ./files/libpthread.so.$(ARCH) ${IDIR_LIBPTHREAD_DEV}/usr/lib/libpthread.so
-	-${CP} ${STAGING_TARGET_DIR}/usr/lib/libpthread_nonshared.a ${IDIR_LIBPTHREAD_DEV}/usr/lib
-endif
-
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index 2529c1eec..149330bef 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -17,7 +17,7 @@ PKG_BUILDDEP+=		libX11 libXv libpng libXext jpeg
 PKG_URL:=		http://www.mplayerhq.hu/
 PKG_SITES:=		http://openadk.org/distfiles/
 
-PKG_ARCH_DEPENDS:=	x86 x86_64 mips
+PKG_ARCH_DEPENDS:=	x86 mips
 
 PKG_FLAVOURS_MPLAYER:=	WITH_DIRECTFB
 PKGFD_WITH_DIRECTFB:=	enable DirectFB video output support
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile
index 8149e9e54..e297bca74 100644
--- a/package/openjdk/Makefile
+++ b/package/openjdk/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		openjdk
 PKG_VERSION:=		6
 PKG_EXTRAVER:=		b22-28_feb_2011
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		2d2bbbb0f9b81f1fec41ec730da8a933 \
 			fd3f35e8a8a2ef9a64c035ed66cea06d \
 			ef7a8b3624ea904bf584bc46d79b5e75 \
@@ -91,14 +91,17 @@ CONFIGURE_ARGS+=	--disable-docs \
 			--with-jar=$(BOOTSTRAPJDK)/bin/jar \
 			--with-rmic=$(BOOTSTRAPJDK)/bin/rmic \
 			--with-native2ascii=$(BOOTSTRAPJDK)/bin/native2ascii \
+			--with-gcj=$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj \
 			--without-rhino
 
+CONFIGURE_ENV+=		PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$${PATH}:${STAGING_TARGET_DIR}/usr/bin
 MAKE_ENV+=		ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \
+			PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$${PATH}:${STAGING_TARGET_DIR}/usr/bin \
 			GCC_HONOUR_COPTS=s \
 			TARGET_ALIAS=$(GNU_TARGET_NAME) BUILD_ALIAS=$(GNU_HOST_NAME) HOST_ALIAS=$(GNU_TARGET_NAME)
 
 OPENJDK_NATIVE_ENV+=	ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME) \
-			PATH=$${PATH}:${STAGING_TARGET_DIR}/usr/bin \
+			PATH=$(STAGING_JAVA_HOST_DIR)/usr/bin:$${PATH}:${STAGING_TARGET_DIR}/usr/bin \
 			GCC_HONOUR_COPTS=s CROSS_COMPILE_ARCH=$(ARCH) \
 			TARGET_ALIAS=$(GNU_TARGET_NAME) BUILD_ALIAS=$(GNU_HOST_NAME) HOST_ALIAS=$(GNU_TARGET_NAME)
 ALL_TARGET:=		icedtea
@@ -136,12 +139,14 @@ pre-configure:
 			--with-jar=$(BOOTSTRAPJDK)/bin/jar \
 			--with-rmic=$(BOOTSTRAPJDK)/bin/rmic \
 			--with-native2ascii=$(BOOTSTRAPJDK)/bin/native2ascii \
+			--with-gcj=$(STAGING_JAVA_HOST_DIR)/usr/bin/gcj \
+			--with-ecj-jar=$(STAGING_JAVA_HOST_DIR)/usr/share/java/ecj.jar \
 			--without-rhino ;\
 	mkdir -p $(WRKBUILD)/generated/sun/awt/X11/generator/ ; \
 	mkdir -p $(WRKBUILD)/openjdk.build/gensrc/sun/awt/X11/generator/ ; \
 	cp $(TOPDIR)/jtools/openjdk/files/sizes.* $(WRKBUILD)/generated/sun/awt/X11/generator/; \
 	cp $(TOPDIR)/jtools/openjdk/files/sizes.* $(WRKBUILD)/openjdk.build/gensrc/sun/awt/X11/generator/; \
-	$(MAKE) icedtea-ecj
+	env ${OPENJDK_NATIVE_ENV} $(MAKE) icedtea-ecj
 	# fixup symlinks to bootstrap jdk
 	ln -sf $(BOOTSTRAPJDK)/bin/java $(WRKBUILD)/openjdk.build-ecj/j2sdk-image/bin/java
 	ln -sf $(BOOTSTRAPJDK)/bin/javac $(WRKBUILD)/openjdk.build-ecj/j2sdk-image/bin/javac
diff --git a/package/qemu/Makefile b/package/qemu/Makefile
index 69bc964c9..7074bf80c 100644
--- a/package/qemu/Makefile
+++ b/package/qemu/Makefile
@@ -15,6 +15,7 @@ PKG_URL:=		http://wwww.qemu.org/
 PKG_SITES:=		http://download.savannah.gnu.org/releases/qemu/
 
 PKG_ARCH_DEPENDS:=	native x86 x86_64
+PKG_SYSTEM_DEPENDS:=	ibm-x40
 
 include $(TOPDIR)/mk/package.mk