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

5 files changed, 3 insertions, 122 deletions

diff --git a/Config.in b/Config.in
index 0c387aa49..df7aca934 100644
--- a/Config.in
+++ b/Config.in
@@ -48,7 +48,6 @@ config ADK_DEVELSYSTEM
 	select ADK_PACKAGE_LIBNCURSES_DEV
 	select ADK_PACKAGE_M4
 	select ADK_PACKAGE_MAKE
-	select ADK_PACKAGE_MKSH
 	select ADK_PACKAGE_PATCH
 	select ADK_PACKAGE_PKG_CONFIG
 	select ADK_PACKAGE_MICROPERL
@@ -61,7 +60,7 @@ config ADK_DEVELSYSTEM
 	  After bootstrapping a Linux system you might want to
 	  switch to native builds with your target. 
 	  If you choose this option, all necessary software needed
-	  for native building will be selected.
+	  for native building will be selected by this option.
 
 config ADK_DEBUG
 	bool "Enable debug support"
diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index c8f3afc2f..466cfad60 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -8,7 +8,7 @@ PKG_DESCR:=		GNU compiler collection
 PKG_SECTION:=		lang
 PKG_OPTS:=		noremove
 PKG_DEPENDS:=		libmpc libgmp mpfr
-PKG_BUILDDEP:=		mpc gmp mpfr
+PKG_BUILDDEP:=		libmpc gmp mpfr
 
 PKG_TARGET_DEPENDS:=	!ag241
 
diff --git a/package/mt-daapd/Makefile b/package/mt-daapd/Makefile
index 3acf1b8fb..4d6d3f1b8 100644
--- a/package/mt-daapd/Makefile
+++ b/package/mt-daapd/Makefile
@@ -26,6 +26,7 @@ CONFIGURE_ARGS+=	--enable-mdns \
 			--with-gdbm-includes="${STAGING_DIR}/usr/include" \
 			--with-gdbm-libs="${STAGING_DIR}/usr/lib" \
 			--without-static-libs
+TLDFLAGS+=		-pthread
 
 post-install:
 	${INSTALL_DIR} ${IDIR_MT_DAAPD}/etc ${IDIR_MT_DAAPD}/usr/{share,sbin}
diff --git a/scripts/split-cfg.sh b/scripts/split-cfg.sh
deleted file mode 100644
index 816bdfc02..000000000
--- a/scripts/split-cfg.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-# Note: this is slow, but it's not the "progress stuff" which cau-
-# ses the slow-down.
-set -x
-
-TOPDIR=$1
-TARGET=$2
-LIBC=$3
-(( x_cols = (COLUMNS > 10) ? COLUMNS - 2 : 80 ))
-typeset -L$x_cols pbar
-
-grep -v '^BUSYBOX\|^# BUSYBOX' $TOPDIR/.config > $TOPDIR/.config.split
-
-mkdir -p $TOPDIR/.cfg_${TARGET}_${LIBC}
-cd $TOPDIR/.cfg_${TARGET}_${LIBC}
-
-oldfiles=$(print -r -- *)
-newfiles=:
-
-print -nu2 'autosplitting main config...'
-while read line; do
-	oline=$line
-	[[ -n $line ]] && if [[ $line = @(\# [A-Z])* ]]; then
-		line=${line#? }
-		if [[ $line = *@( is not set) ]]; then
-			line=${line% is not set}
-		else
-			# some kind of comment
-			line=
-		fi
-	elif [[ $line = @([A-Z])*@(=)* ]]; then
-		line=${line%%=*}
-	elif [[ $line = \#* ]]; then
-		# valid comment
-		line=
-	else
-		# invalid non-comment
-		print -u2 "\nWarning: line '$oline' invalid!"
-		line=
-	fi
-	# if the line is a valid yes/no/whatever, write it
-	# unless the file already exists and has same content
-	if [[ -n $line ]]; then
-		if [[ $line != ADK_HAVE_DOT_CONFIG && -s $line ]]; then
-			fline=$(<$line)
-		else
-			fline=
-		fi
-		[[ $oline = $fline ]] || print -r -- "$oline" >$line
-		if [[ $newfiles = *:$line:* ]]; then
-			print -u2 "\nError: duplicate Config.in option '$line'!"
-			exit 1
-		fi
-		newfiles=$newfiles$line:
-	fi
-done <$TOPDIR/.config.split
-
-# now handle the case of removals
-print -nu2 ' removals...'
-for oldfile in $oldfiles; do
-	[[ $newfiles = *:$oldfile:* ]] || rm -f $oldfile
-done
-print -nu2 '\r'
-
-# now handle package dependencies
-cd $TOPDIR/.cfg_${TARGET}_${LIBC}
-rm -f $TOPDIR/package/*/info.mk
-for option in *; do
-	pbar="$option ..."
-	print -nu2 "$pbar\r"
-	ao=:
-	fgrep -l $option $TOPDIR/package/*/Config.* 2>&- | \
-	    while read line; do
-		print -r -- ${line%/*}/info.mk
-	done | while read fname; do
-		[[ $ao = *:$fname:* ]] && continue
-		ao=$ao$fname:
-		if [ "$option" != "ADK_HAVE_DOT_CONFIG" ];then
-			echo "\${_IPKGS_COOKIE}: \${TOPDIR}/.cfg_${TARGET}_${LIBC}/$option" >>$fname
-		fi
-	done
-done
-exit 0
diff --git a/scripts/strip-script.sh b/scripts/strip-script.sh
deleted file mode 100644
index 355df0e73..000000000
--- a/scripts/strip-script.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (c) 2007
-#	Thorsten Glaser <tg@mirbsd.de>
-#
-# Provided that these terms and disclaimer and all copyright notices
-# are retained or reproduced in an accompanying document, permission
-# is granted to deal in this work without restriction, including un-
-# limited rights to use, publicly perform, distribute, sell, modify,
-# merge, give away, or sublicence.
-#
-# Advertising materials mentioning features or use of this work must
-# display the following acknowledgement:
-#	This product includes material provided by Thorsten Glaser.
-# This acknowledgement does not need to be reprinted if this work is
-# linked into a bigger work whose licence does not allow such clause
-# and the author of this work is given due credit in the bigger work
-# or its accompanying documents, where such information is generally
-# kept, provided that said credits are retained.
-#
-# This work is provided "AS IS" and WITHOUT WARRANTY of any kind, to
-# the utmost extent permitted by applicable law, neither express nor
-# implied; without malicious intent or gross negligence. In no event
-# may a licensor, author or contributor be held liable for indirect,
-# direct, other damage, loss, or other issues arising in any way out
-# of dealing in the work, even if advised of the possibility of such
-# damage or existence of a defect, except proven that it results out
-# of said person's immediate fault when using the work as intended.
-# Shell script to strip down a shell script (filter).
-
-shopt -s extglob
-cat "$@" | while read -r _line; do
-	set -o noglob
-	[[ $_line = \#* && $_line != @(#!)* ]] && continue
-	[[ -n $_line ]] && builtin printf '%s\n' "$_line"
-done
-exit 0