Merge branch 'master' of git+ssh://openadk.org/git/openadk

package/classpath/Makefile

@@ -14,6 +14,7 @@ PKG_DEPENDS:=		libgtk gdk-pixbuf orbit2 gconf
 PKG_URL:=		http://www.gnu.org/software/classpath/home.html
 PKG_SITES:=		${MASTER_SITE_GNU:=classpath/}
 
+PKG_HOST_DEPENDS:=	linux
 PKG_ARCH_DEPENDS:=	!cris !arm
 
 include $(TOPDIR)/mk/package.mk

package/glib/Makefile

@@ -43,10 +43,11 @@ CONFIGURE_ENV+=		glib_cv_long_long_format=ll \
 			ac_cv_func_posix_getgrgid_r=yes
 
 pre-configure:
-ifneq ($(OStype),Darwin)
+ifneq ($(OStype),FreeBSD)
 	(cd ${WRKBUILD}; rm -rf config.{cache,status}; \
-		./configure --prefix=$(STAGING_HOST_DIR) \
-	);
+		CFLAGS="-L/usr/local/lib" ./configure --prefix=$(STAGING_HOST_DIR) \
+			--with-libiconv=gnu \
+	)
 	${MAKE} -C ${WRKBUILD} V=1
 	$(CP) ${WRKBUILD}/gio/.libs/glib-compile-schemas ${STAGING_HOST_DIR}/bin
 	$(CP) ${WRKBUILD}/gobject/.libs/glib-genmarshal ${STAGING_HOST_DIR}/bin

package/orbit2/Makefile

@@ -26,6 +26,7 @@ $(eval $(call PKG_template,ORBIT2,orbit2,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEP
 $(eval $(call PKG_template,ORBIT2_DEV,orbit2-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ORBIT2_DEV},${PKGSC_ORBIT2_DEV}))
 
 CFLAGS_FOR_BUILD+=	$(shell ${BUILD_LIBIDL_CONFIG} --cflags)
+CFLAGS_FOR_BUILD+=	-I/usr/local/include
 LDFLAGS_FOR_BUILD+=	$(shell ${BUILD_LIBIDL_CONFIG} --libs)
 LDFLAGS_FOR_BUILD+=	-lgmodule-2.0
 CONFIGURE_ENV+=		ac_cv_alignof_CORBA_octet=1 \

package/xfsprogs/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		xfsprogs
 PKG_VERSION:=		3.1.5
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		b1db37749e2b4149a0dd178abff956be
 PKG_DESCR:=		Utilities for XFS filesystems
 PKG_SECTION:=		fs
@@ -32,5 +32,6 @@ do-install:
 	${INSTALL_DIR} ${IDIR_XFSPROGS}/usr/sbin
 	${INSTALL_BIN} ${WRKBUILD}/mkfs/mkfs.xfs ${IDIR_XFSPROGS}/usr/sbin
 	${INSTALL_BIN} ${WRKBUILD}/repair/xfs_repair ${IDIR_XFSPROGS}/usr/sbin
+	${INSTALL_BIN} ${WRKBUILD}/growfs/xfs_growfs ${IDIR_XFSPROGS}/usr/sbin
 
 include ${TOPDIR}/mk/pkg-bottom.mk

toolchain/Config.in

@@ -7,7 +7,7 @@ menu "Toolchain settings"
 config ADK_TOOLCHAIN_GDB
 	prompt "Enable building of the GNU debugger"
 	boolean
-	default y
+	default y if !ADK_TARGET_SYSTEM_ATMEL_NGW100
 
 config ADK_TOOLCHAIN_GCC_CXX
 	prompt "Enable building of G++ (C++ language support in GCC)"