summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-02-21 18:51:50 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-02-21 18:51:50 +0100
commit18430215845a1ba4adab10062d33204fd26bd8fb (patch)
tree33aa3ec2a66f0c7a170837135a74059359b42a4e
parentf799b95adfe39ddee1324e2901a823ecdf2fe44d (diff)
parent08c3724108f33060956438bff670ee1135f473b1 (diff)
Merge branch 'master' of git+ssh://wbx@openadk.org/git/openadk
-rw-r--r--TODO4
-rw-r--r--mk/build.mk12
-rw-r--r--mk/pkg-bottom.mk13
-rw-r--r--mk/vars.mk8
-rw-r--r--package/6tunnel/Makefile2
-rw-r--r--package/6tunnel/patches/autotool.patch4791
-rw-r--r--package/6tunnel/patches/patch-Makefile_in27
-rw-r--r--package/6tunnel/patches/patch-Makefile_in.orig18
-rw-r--r--package/Config.in1
-rw-r--r--package/bogofilter/Makefile1
-rw-r--r--package/bogofilter/patches/autotool.patch21818
-rw-r--r--package/bogofilter/patches/patch-configure_ac53
-rw-r--r--package/bridge-utils/Makefile1
-rw-r--r--package/bridge-utils/patches/autotool.patch5082
-rw-r--r--package/bridge-utils/patches/patch-libbridge_Makefile_in11
-rw-r--r--package/cbtt/Makefile52
-rw-r--r--package/cbtt/patches/patch-Makefile61
-rw-r--r--package/cbtt/patches/patch-base64_cpp20
-rw-r--r--package/cbtt/patches/patch-bnbt_h11
-rw-r--r--package/gpsd/Makefile5
-rw-r--r--package/gpsd/patches/autotool.patch56056
-rw-r--r--package/gpsd/patches/patch-configure_ac95
-rw-r--r--package/icecast/Makefile4
-rw-r--r--package/icecast/patches/autotool.patch69856
-rw-r--r--package/icecast/patches/patch-m4_xiph_curl_m411
-rw-r--r--package/kismet/patches/patch-Makefile_in48
-rw-r--r--package/kismet/patches/patch-configure17
-rw-r--r--package/kismet/patches/patch-ifcontrol_cc6
-rw-r--r--package/kismet/patches/patch-iwcontrol_cc15
-rw-r--r--package/libgd/Makefile3
-rw-r--r--package/libnids/Makefile7
-rw-r--r--package/libnids/patches/autotool.patch10047
-rw-r--r--package/libnids/patches/patch-configure_in11
-rw-r--r--package/libupnp/Makefile4
-rw-r--r--package/libupnp/patches/autotool.patch67035
-rw-r--r--package/libupnp/patches/patch-configure_ac11
-rw-r--r--package/libvirt/Makefile2
-rw-r--r--package/libvorbisidec/Makefile6
-rw-r--r--package/libvorbisidec/patches/autotool.patch36239
-rw-r--r--package/mpd/Makefile8
-rw-r--r--package/mpd/patches/autotool.patch9293
-rw-r--r--package/mpd/patches/patch-m4_lame_m420
-rw-r--r--package/python/Makefile2
-rw-r--r--package/squid/Makefile3
-rw-r--r--package/squid/patches/autotool.patch153653
-rw-r--r--package/squid/patches/patch-configure_in13
-rw-r--r--package/squid/patches/patch-src_Makefile_am22
-rw-r--r--package/tslib/Makefile3
-rw-r--r--package/tslib/patches/autotool.patch44531
-rw-r--r--package/tslib/patches/patch-configure_ac11
-rwxr-xr-xscripts/autoconf26
-rw-r--r--scripts/automake.dep2
-rwxr-xr-xscripts/autoreconf38
-rw-r--r--scripts/scan-tools.sh24
-rwxr-xr-xscripts/tsort13
-rw-r--r--target/ag241/Makefile3
-rw-r--r--target/bulk.lst1
-rw-r--r--target/lemote/uclibc.config2
-rw-r--r--target/qemu-arm/Makefile3
-rw-r--r--target/qemu-arm/uclibc.config2
-rw-r--r--target/qemu-cris/uclibc.config2
-rw-r--r--target/qemu-mips/uclibc.config2
-rw-r--r--target/qemu-mips64/uclibc.config2
-rw-r--r--target/qemu-mips64el/uclibc.config2
-rw-r--r--target/qemu-mipsel/uclibc.config2
-rw-r--r--target/qemu-x86/Makefile3
-rw-r--r--target/qemu-x86_64/Makefile3
-rw-r--r--target/qemu-x86_64/uclibc.config2
-rw-r--r--target/rb411/uclibc.config2
-rw-r--r--target/rb433/Makefile1
-rw-r--r--target/rb433/uclibc.config2
-rw-r--r--target/rb532/Makefile2
-rw-r--r--target/rescue-x86/uclibc.config2
-rw-r--r--target/toolchain-arm/uclibc.config2
-rw-r--r--target/toolchain-armel/uclibc.config2
-rw-r--r--target/toolchain-mips/uclibc.config2
-rw-r--r--target/toolchain-mipsel/uclibc.config2
-rw-r--r--target/toolchain-x86_64/uclibc.config2
-rw-r--r--target/wrap/Makefile1
-rw-r--r--target/zaurus/uclibc.config2
-rw-r--r--toolchain/eglibc/Makefile11
-rw-r--r--toolchain/gcc/Makefile9
-rw-r--r--toolchain/glibc/Makefile4
-rw-r--r--toolchain/glibc/Makefile.inc2
-rw-r--r--toolchain/glibc/patches/longjmp_chk.patch56
85 files changed, 478606 insertions, 653 deletions
diff --git a/TODO b/TODO
index 9c37c6251..5b7cb4fe8 100644
--- a/TODO
+++ b/TODO
@@ -1,8 +1,8 @@
+- update to 2.6.33
+- microsd filesystem for foxg20
- implement update for MTD devices (ag241)
- fix watchdog for alix1c (mfgpt timers problem)
-- netbsd build
- macos x build
-- update to 2.6.33
- use LZMA kernels for MIPS targets
- package drbd
- new packages for openais and pacemaker
diff --git a/mk/build.mk b/mk/build.mk
index f6e438508..879bdc04b 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -415,38 +415,38 @@ endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
# build all targets and combinations
bulk:
while read target libc fs; do \
- mkdir -p $(TOPDIR)/bin/$$target_$$libc; \
+ mkdir -p $(TOPDIR)/bin/$${target}_$$libc; \
( \
echo === building $$target $$libc $$fs on $$(date); \
$(GMAKE) prereq && \
$(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs defconfig; \
$(GMAKE) VERBOSE=1 all; \
rm .config; \
- ) 2>&1 | tee $(TOPDIR)/bin/$$target_$$libc/$$target-$$libc-$$fs.log; \
+ ) 2>&1 | tee $(TOPDIR)/bin/$${target}_$$libc/$$target-$$libc-$$fs.log; \
done <${TOPDIR}/target/bulk.lst
bulkall:
while read target libc fs; do \
- mkdir -p $(TOPDIR)/bin/$$target_$$libc; \
+ mkdir -p $(TOPDIR)/bin/$${target}_$$libc; \
( \
echo === building $$target $$libc $$fs on $$(date); \
$(GMAKE) prereq && \
$(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs allconfig; \
$(GMAKE) VERBOSE=1 all; \
rm .config; \
- ) 2>&1 | tee $(TOPDIR)/bin/$$target_$$libc/$$target-$$libc-$$fs.log; \
+ ) 2>&1 | tee $(TOPDIR)/bin/$${target}_$$libc/$$target-$$libc-$$fs.log; \
done <${TOPDIR}/target/bulk.lst
bulkallmod:
while read target libc fs; do \
- mkdir -p $(TOPDIR)/bin/$$target_$$libc; \
+ mkdir -p $(TOPDIR)/bin/$${target}_$$libc; \
( \
echo === building $$target $$libc $$fs on $$(date); \
$(GMAKE) prereq && \
$(GMAKE) TARGET=$$target LIBC=$$libc FS=$$fs allmodconfig; \
$(GMAKE) VERBOSE=1 all; \
rm .config; \
- ) 2>&1 | tee $(TOPDIR)/bin/$$target_$$libc/$$target-$$libc-$$fs.log; \
+ ) 2>&1 | tee $(TOPDIR)/bin/$${target}_$$libc/$$target-$$libc-$$fs.log; \
done <${TOPDIR}/target/bulk.lst
menu .menu: $(wildcard ${TOPDIR}/package/*/Makefile)
diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk
index 41fecf3f2..d78cc5876 100644
--- a/mk/pkg-bottom.mk
+++ b/mk/pkg-bottom.mk
@@ -18,7 +18,7 @@ do-configure:
post-configure:
${_CONFIGURE_COOKIE}: ${_PATCH_COOKIE}
@sed -e '/^#/d' ${REORDER_DEPENDENCIES} | \
- tsort | tac | while read f; do \
+ tsort | while read f; do \
cd ${WRKSRC}; \
case $$f in \
/*) \
@@ -34,17 +34,6 @@ ${_CONFIGURE_COOKIE}: ${_PATCH_COOKIE}
mkdir -p ${WRKBUILD}
@${MAKE} pre-configure $(MAKE_TRACE)
-ifneq ($(filter autogen,${AUTOTOOL_STYLE}),)
- cd ${WRKBUILD}; \
- ./autogen.sh $(MAKE_TRACE)
-endif
-ifneq ($(filter autotool,${AUTOTOOL_STYLE}),)
- cd ${WRKBUILD}; \
- autoreconf -vf;libtoolize $(MAKE_TRACE)
-endif
-ifneq ($(filter autoconf,${AUTOTOOL_STYLE}),)
- cd ${WRKBUILD}; autoconf $(MAKE_TRACE)
-endif
ifneq ($(filter manual,${CONFIG_STYLE}),)
env ${CONFIGURE_ENV} ${MAKE} do-configure $(MAKE_TRACE)
else ifneq ($(filter minimal,${CONFIG_STYLE}),)
diff --git a/mk/vars.mk b/mk/vars.mk
index 2151348b0..345531b3f 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -37,15 +37,15 @@ PACKAGE_DIR:= $(BIN_DIR)/packages
TARGET_DIR:= $(BASE_DIR)/root_${ADK_TARGET}_${ADK_LIBC}
TARGET_DIR_PFX:= $(BASE_DIR)/root_*
TARGET_PATH= ${SCRIPT_DIR}:${STAGING_TOOLS}/bin:${STAGING_DIR}/scripts:${_PATH}
-REAL_GNU_TARGET_NAME= $(CPU_ARCH)-linux-$(ADK_TARGET_SUFFIX)
-GNU_TARGET_NAME= $(CPU_ARCH)-linux
+REAL_GNU_TARGET_NAME= $(CPU_ARCH)-openadk-linux-$(ADK_TARGET_SUFFIX)
+GNU_TARGET_NAME= $(CPU_ARCH)-openadk-linux
TOOLCHAIN_SYSROOT:= $(TOOLCHAIN_BUILD_DIR)/libc_dev
ifeq ($(ADK_NATIVE),y)
-TARGET_COMPILER_PREFIX?=
TARGET_CROSS:=
+TARGET_COMPILER_PREFIX?=
else
+TARGET_CROSS:= $(STAGING_TOOLS)/bin/$(REAL_GNU_TARGET_NAME)-
TARGET_COMPILER_PREFIX?=${TARGET_CROSS}
-TARGET_CROSS:= $(STAGING_TOOLS)/bin/$(CPU_ARCH)-linux-$(ADK_TARGET_SUFFIX)-
endif
TARGET_CC:= ${TARGET_COMPILER_PREFIX}gcc
TARGET_CXX:= ${TARGET_COMPILER_PREFIX}g++
diff --git a/package/6tunnel/Makefile b/package/6tunnel/Makefile
index edce0ecaa..cb519c51c 100644
--- a/package/6tunnel/Makefile
+++ b/package/6tunnel/Makefile
@@ -17,8 +17,6 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,6TUNNEL,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-AUTOTOOL_STYLE:= autoconf
-
post-install:
$(INSTALL_DIR) $(IDIR_6TUNNEL)/usr/sbin
$(INSTALL_BIN) $(WRKBUILD)/6tunnel $(IDIR_6TUNNEL)/usr/sbin/
diff --git a/package/6tunnel/patches/autotool.patch b/package/6tunnel/patches/autotool.patch
new file mode 100644
index 000000000..61d7e90ca
--- /dev/null
+++ b/package/6tunnel/patches/autotool.patch
@@ -0,0 +1,4791 @@
+diff -Nur 6tunnel-0.11rc2.orig/configure 6tunnel-0.11rc2/configure
+--- 6tunnel-0.11rc2.orig/configure 1970-01-01 01:00:00.000000000 +0100
++++ 6tunnel-0.11rc2/configure 2010-02-18 20:34:56.116853593 +0100
+@@ -0,0 +1,4759 @@
++#! /bin/sh
++# Guess values for system-dependent variables and create Makefiles.
++# Generated by GNU Autoconf 2.65.
++#
++#
++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
++# Inc.
++#
++#
++# This configure script is free software; the Free Software Foundation
++# gives unlimited permission to copy, distribute and modify it.
++## -------------------- ##
++## M4sh Initialization. ##
++## -------------------- ##
++
++# Be more Bourne compatible
++DUALCASE=1; export DUALCASE # for MKS sh
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
++ emulate sh
++ NULLCMD=:
++ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
++ # is contrary to our usage. Disable this feature.
++ alias -g '${1+"$@"}'='"$@"'
++ setopt NO_GLOB_SUBST
++else
++ case `(set -o) 2>/dev/null` in #(
++ *posix*) :
++ set -o posix ;; #(
++ *) :
++ ;;
++esac
++fi
++
++
++as_nl='
++'
++export as_nl
++# Printing a long string crashes Solaris 7 /usr/bin/printf.
++as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
++# Prefer a ksh shell builtin over an external printf program on Solaris,
++# but without wasting forks for bash or zsh.
++if test -z "$BASH_VERSION$ZSH_VERSION" \
++ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
++ as_echo='print -r --'
++ as_echo_n='print -rn --'
++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
++ as_echo='printf %s\n'
++ as_echo_n='printf %s'
++else
++ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
++ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
++ as_echo_n='/usr/ucb/echo -n'
++ else
++ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
++ as_echo_n_body='eval
++ arg=$1;
++ case $arg in #(
++ *"$as_nl"*)
++ expr "X$arg" : "X\\(.*\\)$as_nl";
++ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
++ esac;
++ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
++ '
++ export as_echo_n_body
++ as_echo_n='sh -c $as_echo_n_body as_echo'
++ fi
++ export as_echo_body
++ as_echo='sh -c $as_echo_body as_echo'
++fi
++
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++ PATH_SEPARATOR=:
++ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
++ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
++ PATH_SEPARATOR=';'
++ }
++fi
++
++
++# IFS
++# We need space, tab and new line, in precisely that order. Quoting is
++# there to prevent editors from complaining about space-tab.
++# (If _AS_PATH_WALK were called with IFS unset, it would disable word
++# splitting by setting IFS to empty value.)
++IFS=" "" $as_nl"
++
++# Find who we are. Look in the path if we contain no directory separator.
++case $0 in #((
++ *[\\/]* ) as_myself=$0 ;;
++ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++ done
++IFS=$as_save_IFS
++
++ ;;
++esac
++# We did not find ourselves, most probably we were run as `sh COMMAND'
++# in which case we are not to be found in the path.
++if test "x$as_myself" = x; then
++ as_myself=$0
++fi
++if test ! -f "$as_myself"; then
++ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
++ exit 1
++fi
++
++# Unset variables that we do not need and which cause bugs (e.g. in
++# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
++# suppresses any "Segmentation fault" message there. '((' could
++# trigger a bug in pdksh 5.2.14.
++for as_var in BASH_ENV ENV MAIL MAILPATH
++do eval test x\${$as_var+set} = xset \
++ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
++done
++PS1='$ '
++PS2='> '
++PS4='+ '
++
++# NLS nuisances.
++LC_ALL=C
++export LC_ALL
++LANGUAGE=C
++export LANGUAGE
++
++# CDPATH.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
++
++if test "x$CONFIG_SHELL" = x; then
++ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
++ emulate sh
++ NULLCMD=:
++ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
++ # is contrary to our usage. Disable this feature.
++ alias -g '\${1+\"\$@\"}'='\"\$@\"'
++ setopt NO_GLOB_SUBST
++else
++ case \`(set -o) 2>/dev/null\` in #(
++ *posix*) :
++ set -o posix ;; #(
++ *) :
++ ;;
++esac
++fi
++"
++ as_required="as_fn_return () { (exit \$1); }
++as_fn_success () { as_fn_return 0; }
++as_fn_failure () { as_fn_return 1; }
++as_fn_ret_success () { return 0; }
++as_fn_ret_failure () { return 1; }
++
++exitcode=0
++as_fn_success || { exitcode=1; echo as_fn_success failed.; }
++as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
++as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
++as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
++if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
++
++else
++ exitcode=1; echo positional parameters were not saved.
++fi
++test x\$exitcode = x0 || exit 1"
++ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
++ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
++ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
++ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
++test \$(( 1 + 1 )) = 2 || exit 1"
++ if (eval "$as_required") 2>/dev/null; then :
++ as_have_required=yes
++else
++ as_have_required=no
++fi
++ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
++
++else
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++as_found=false
++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ as_found=:
++ case $as_dir in #(
++ /*)
++ for as_base in sh bash ksh sh5; do
++ # Try only shells that exist, to save several forks.
++ as_shell=$as_dir/$as_base
++ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
++ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
++ CONFIG_SHELL=$as_shell as_have_required=yes
++ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
++ break 2
++fi
++fi
++ done;;
++ esac
++ as_found=false
++done
++$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
++ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
++ CONFIG_SHELL=$SHELL as_have_required=yes
++fi; }
++IFS=$as_save_IFS
++
++
++ if test "x$CONFIG_SHELL" != x; then :
++ # We cannot yet assume a decent shell, so we have to provide a
++ # neutralization value for shells without unset; and this also
++ # works around shells that cannot unset nonexistent variables.
++ BASH_ENV=/dev/null
++ ENV=/dev/null
++ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
++ export CONFIG_SHELL
++ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
++fi
++
++ if test x$as_have_required = xno; then :
++ $as_echo "$0: This script requires a shell more modern than all"
++ $as_echo "$0: the shells that I found on your system."
++ if test x${ZSH_VERSION+set} = xset ; then
++ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
++ $as_echo "$0: be upgraded to zsh 4.3.4 or later."
++ else
++ $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
++$0: including any error possibly output before this
++$0: message. Then install a modern shell, or manually run
++$0: the script under such a shell if you do have one."
++ fi
++ exit 1
++fi
++fi
++fi
++SHELL=${CONFIG_SHELL-/bin/sh}
++export SHELL
++# Unset more variables known to interfere with behavior of common tools.
++CLICOLOR_FORCE= GREP_OPTIONS=
++unset CLICOLOR_FORCE GREP_OPTIONS