more 2.6.39 fixes

25 files changed, 118 insertions, 2690 deletions

diff --git a/mk/build.mk b/mk/build.mk
index 8dbd321d2..78c858f17 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -14,7 +14,7 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_STATIC=n \
 			ADK_LOCALES=n \
 			ADK_MAKE_PARALLEL=y \
-			ADK_MAKE_JOBS=4 \
+			ADK_MAKE_JOBS=1 \
 			ADK_USE_CCACHE=n \
 			ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER=n \
 			ADK_PACKAGE_GRUB=n \
diff --git a/mk/modules.mk b/mk/modules.mk
index 0d6a86ebb..c4b3ba803 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -78,7 +78,7 @@ $(eval $(call KMOD_template,P54_COMMON,p54-common,\
 ,68))
 
 $(eval $(call KMOD_template,RTL8187,rtl8187,\
-	$(MODULES_DIR)/kernel/drivers/net/wireless/rtl818x/rtl8187 \
+	$(MODULES_DIR)/kernel/drivers/net/wireless/rtl818x/rtl8187/rtl8187 \
 ,70))
 
 $(eval $(call KMOD_template,B43,b43,\
@@ -1120,10 +1120,10 @@ $(eval $(call KMOD_template,SND_CS5535AUDIO,snd-cs5535audio,\
 	$(MODULES_DIR)/kernel/sound/pci/cs5535audio/snd-cs5535audio \
 ,55))
 
-V4L_COMPAT:=drivers/media/video/v4l1-compat
-ifeq ($(ADK_LINUX_64),y)
-V4L_COMPAT+=drivers/media/video/v4l2-compat-ioctl32
-endif
+#V4L_COMPAT:=drivers/media/video/v4l1-compat
+#ifeq ($(ADK_LINUX_64),y)
+#V4L_COMPAT+=drivers/media/video/v4l2-compat-ioctl32
+#endif
 
 $(eval $(call KMOD_template,VIDEO_DEV,video-dev,\
 	$(foreach mod, $(V4L_COMPAT),$(MODULES_DIR)/kernel/$(mod)) \
@@ -1273,11 +1273,11 @@ $(eval $(call KMOD_template,BT_HCIUART,bt-hciuart,\
 	$(MODULES_DIR)/kernel/drivers/bluetooth/hci_uart \
 ,75))
 
-$(eval $(call KMOD_template,BT_L2CAP,bt-l2cap,\
+#$(eval $(call KMOD_template,BT_L2CAP,bt-l2cap,\
 	$(MODULES_DIR)/kernel/net/bluetooth/l2cap \
 ,80))
 
-$(eval $(call KMOD_template,BT_SCO,bt-sco,\
+#$(eval $(call KMOD_template,BT_SCO,bt-sco,\
 	$(MODULES_DIR)/kernel/net/bluetooth/sco \
 ,85))
 
diff --git a/package/cluster-glue/patches/patch-configure b/package/cluster-glue/patches/patch-configure
new file mode 100644
index 000000000..4e90d47e7
--- /dev/null
+++ b/package/cluster-glue/patches/patch-configure
@@ -0,0 +1,11 @@
+--- cluster-glue-1.0.7.orig/configure	2011-05-24 14:40:32.000000000 +0200
++++ cluster-glue-1.0.7/configure	2011-06-22 13:30:10.976951778 +0200
+@@ -12620,7 +12620,7 @@ case $libdir in
+     *prefix*|NONE)
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking which lib directory to use" >&5
+ $as_echo_n "checking which lib directory to use... " >&6; }
+-    for aDir in lib64 lib
++    for aDir in lib
+     do
+       trydir="${exec_prefix}/${aDir}"
+       if
diff --git a/package/corosync/patches/patch-Makefile_in b/package/corosync/patches/patch-Makefile_in
new file mode 100644
index 000000000..4fc1ef74a
--- /dev/null
+++ b/package/corosync/patches/patch-Makefile_in
@@ -0,0 +1,11 @@
+--- corosync-1.3.1.orig/Makefile.in	2011-04-25 04:39:52.000000000 +0200
++++ corosync-1.3.1/Makefile.in	2011-06-25 21:58:51.012672595 +0200
+@@ -320,7 +320,7 @@ corosysconf_DATA = conf/corosync.conf.ex
+ 			  conf/corosync.conf.example.udpu
+ 
+ SUBDIRS = include lcr lib exec services tools test pkgconfig \
+-			  man init
++			  init
+ 
+ RPMBUILDOPTS = --define "_sourcedir $(abs_builddir)" \
+ 		  --define "_specdir $(abs_builddir)" \
diff --git a/package/corosync/patches/patch-include_corosync_coroipc_ipc_h b/package/corosync/patches/patch-include_corosync_coroipc_ipc_h
new file mode 100644
index 000000000..82c9514b3
--- /dev/null
+++ b/package/corosync/patches/patch-include_corosync_coroipc_ipc_h
@@ -0,0 +1,11 @@
+--- corosync-1.3.1.orig/include/corosync/coroipc_ipc.h	2011-04-25 04:37:30.000000000 +0200
++++ corosync-1.3.1/include/corosync/coroipc_ipc.h	2011-06-26 18:49:29.245183024 +0200
+@@ -44,7 +44,7 @@
+  * Darwin claims to support process shared synchronization
+  * but it really does not.  The unistd.h header file is wrong.
+  */
+-#if defined(COROSYNC_DARWIN) || defined(__UCLIBC__)
++#if defined(COROSYNC_DARWIN)
+ #undef _POSIX_THREAD_PROCESS_SHARED
+ #define _POSIX_THREAD_PROCESS_SHARED -1
+ #endif
diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile
index eb9dc9441..de0d75403 100644
--- a/package/libpthread/Makefile
+++ b/package/libpthread/Makefile
@@ -44,7 +44,6 @@ libpthread-install:
 ifeq ($(ADK_NATIVE),)
 	${INSTALL_DIR} ${IDIR_LIBPTHREAD}/lib
 	${CP} ${STAGING_TARGET_DIR}/lib/libpthread*.so* ${IDIR_LIBPTHREAD}/lib
-	(cd ${STAGING_TARGET_DIR}/lib && ln -sf libpthread.so.0 libpthread.so)
 endif
 
 libpthread-dev-install:
diff --git a/package/libpthread/files/libpthread.postinst b/package/libpthread/files/libpthread.postinst
new file mode 100644
index 000000000..76a6c81a4
--- /dev/null
+++ b/package/libpthread/files/libpthread.postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+if [ ! -z $IPKG_INSTROOT ];then 
+	(cd $IPKG_INSTROOT/lib && ln -sf libpthread.so.0 libpthread.so)
+fi
diff --git a/package/llvm/patches/patch-Makefile b/package/llvm/patches/patch-Makefile
index 2839368ed..b1a4c6bcc 100644
--- a/package/llvm/patches/patch-Makefile
+++ b/package/llvm/patches/patch-Makefile
@@ -1,10 +1,11 @@
 --- llvm-2.9.orig/Makefile	2010-11-29 19:16:10.000000000 +0100
-+++ llvm-2.9/Makefile	2011-05-16 20:54:17.476608532 +0200
-@@ -115,6 +115,7 @@ cross-compile-build-tools:
++++ llvm-2.9/Makefile	2011-06-25 12:16:13.422682536 +0200
+@@ -115,6 +115,8 @@ cross-compile-build-tools:
  	$(Verb) if [ ! -f BuildTools/Makefile ]; then \
            $(MKDIR) BuildTools; \
  	  cd BuildTools ; \
 +	  unset CC ; \
++	  unset CXX ; \
  	  unset CFLAGS ; \
  	  unset CXXFLAGS ; \
  	  $(PROJ_SRC_DIR)/configure --build=$(BUILD_TRIPLE) \
diff --git a/package/motion/Makefile b/package/motion/Makefile
index b32b97280..605e61b55 100644
--- a/package/motion/Makefile
+++ b/package/motion/Makefile
@@ -22,7 +22,8 @@ CONFIGURE_ARGS+=	--without-ffmpeg \
 			--without-jpeg-mmx \
 			--without-optimizecpu \
 			--without-mysql \
-			--without-pgsql
+			--without-pgsql \
+			--without-v4l
 
 post-install:
 	${INSTALL_DIR} ${IDIR_MOTION}/usr/bin
diff --git a/package/openais/patches/patch-Makefile_in b/package/openais/patches/patch-Makefile_in
new file mode 100644
index 000000000..ab7f536bb
--- /dev/null
+++ b/package/openais/patches/patch-Makefile_in
@@ -0,0 +1,11 @@
+--- openais-1.1.4.orig/Makefile.in	2010-08-23 21:59:26.000000000 +0200
++++ openais-1.1.4/Makefile.in	2011-06-25 22:04:16.722682552 +0200
+@@ -285,7 +285,7 @@ MAINTAINERCLEANFILES = Makefile.in acloc
+ dist_doc_DATA = LICENSE README.amf AUTHORS
+ corosysconfdir = ${COROSYSCONFDIR}
+ corosysconf_DATA = conf/amf.conf.example
+-SUBDIRS = include lib services test pkgconfig man init
++SUBDIRS = include lib services test pkgconfig init
+ RPMBUILDOPTS = --define "_sourcedir $(abs_builddir)" \
+ 		  --define "_specdir $(abs_builddir)" \
+ 		  --define "_builddir $(abs_builddir)" \
diff --git a/package/pacemaker/patches/patch-configure b/package/pacemaker/patches/patch-configure
index a3eca9a9d..5206c0b3b 100644
--- a/package/pacemaker/patches/patch-configure
+++ b/package/pacemaker/patches/patch-configure
@@ -1,5 +1,5 @@
 --- pacemaker-1.0.11.orig/configure	2011-05-24 17:00:37.000000000 +0200
-+++ pacemaker-1.0.11/configure	2011-05-24 17:39:43.000000000 +0200
++++ pacemaker-1.0.11/configure	2011-06-25 22:21:57.912681957 +0200
 @@ -12484,7 +12484,7 @@ $as_echo_n "checking for $2 in $1... " >
  	  printf "#include <stdio.h>\n" > ${Cfile}.c
  	  printf "#include <%s>\n" $1 >> ${Cfile}.c
@@ -9,6 +9,15 @@
  	  value=`${Cfile}`
  	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $value" >&5
  $as_echo "$value" >&6; }
+@@ -12660,7 +12660,7 @@ case $libdir in
+     *prefix*|NONE)
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking which lib directory to use" >&5
+ $as_echo_n "checking which lib directory to use... " >&6; }
+-    for aDir in lib64 lib
++    for aDir in lib
+     do
+       trydir="${exec_prefix}/${aDir}"
+       if
 @@ -12713,33 +12713,11 @@ $as_echo "$as_me: WARNING: $j directory 
  done
  
diff --git a/package/pacemaker/patches/patch-configure.orig b/package/pacemaker/patches/patch-configure.orig
index ff7af42f7..a3eca9a9d 100644
--- a/package/pacemaker/patches/patch-configure.orig
+++ b/package/pacemaker/patches/patch-configure.orig
@@ -1,5 +1,5 @@
 --- pacemaker-1.0.11.orig/configure	2011-05-24 17:00:37.000000000 +0200
-+++ pacemaker-1.0.11/configure	2011-05-24 17:31:21.000000000 +0200
++++ pacemaker-1.0.11/configure	2011-05-24 17:39:43.000000000 +0200
 @@ -12484,7 +12484,7 @@ $as_echo_n "checking for $2 in $1... " >
  	  printf "#include <stdio.h>\n" > ${Cfile}.c
  	  printf "#include <%s>\n" $1 >> ${Cfile}.c
@@ -44,3 +44,11 @@
  
  
  
+@@ -17159,7 +17137,6 @@ else
+ 
+ 	# We had to eliminate -Wnested-externs because of libtool changes
+         EXTRA_FLAGS="-fgnu89-inline
+-		-fstack-protector-all
+ 		-Wall
+ 		-Waggregate-return
+ 		-Wbad-function-cast
diff --git a/package/pacemaker/patches/patch-libtool b/package/pacemaker/patches/patch-libtool
deleted file mode 100644
index 2fa036d10..000000000
--- a/package/pacemaker/patches/patch-libtool
+++ /dev/null
@@ -1,1198 +0,0 @@
---- pacemaker-1.0.11.orig/libtool	2011-04-18 20:21:47.000000000 +0200
-+++ pacemaker-1.0.11/libtool	2011-05-24 17:40:27.000000000 +0200
-@@ -1,7 +1,7 @@
--#! /bin/sh
-+#! /bin/bash
- 
- # libtool - Provide generalized library-building support services.
--# Generated automatically by config.status (libtool) 2.4
-+# Generated automatically by config.status (pacemaker) 1.0.11
- # Libtool was configured on host neon.foo.bar:
- # NOTE: Changes made to this file will be lost: look at ltmain.sh.
- #
-@@ -35,7 +35,7 @@
- 
- 
- # The names of the tagged configurations supported by this script.
--available_tags="CXX F77 FC GCJ RC "
-+available_tags=""
- 
- # ### BEGIN LIBTOOL CONFIG
- 
-@@ -43,15 +43,6 @@ available_tags="CXX F77 FC GCJ RC "
- macro_version=2.4
- macro_revision=1.3293
- 
--# Assembler program.
--AS="as"
--
--# DLL creation program.
--DLLTOOL="false"
--
--# Object dumper program.
--OBJDUMP="false"
--
- # Whether or not to build shared libraries.
- build_libtool_libs=yes
- 
-@@ -62,26 +53,26 @@ build_old_libs=yes
- pic_mode=default
- 
- # Whether or not to optimize for fast installation.
--fast_install=needless
-+fast_install=yes
- 
- # Shell to use when invoking shell scripts.
--SHELL="/bin/sh"
-+SHELL="/bin/bash"
- 
- # An echo program that protects backslashes.
- ECHO="printf %s\\n"
- 
- # The host system.
--host_alias=
--host=x86_64-apple-darwin10.6.0
--host_os=darwin10.6.0
-+host_alias=i586-openadk-linux
-+host=i586-openadk-linux-gnu
-+host_os=linux-gnu
- 
- # The build system.
--build_alias=
--build=x86_64-apple-darwin10.6.0
--build_os=darwin10.6.0
-+build_alias=i686-apple-darwin10
-+build=i686-apple-darwin10
-+build_os=darwin10
- 
- # A sed program that does not truncate output.
--SED="/usr/bin/sed"
-+SED="/Volumes/adk/openadk/scripts/sed"
- 
- # Sed that helps us avoid accidentally triggering echo(1) options like -n.
- Xsed="$SED -e 1s/^X//"
-@@ -96,7 +87,7 @@ EGREP="/usr/bin/grep -E"
- FGREP="/usr/bin/grep -F"
- 
- # A BSD- or MS-compatible name lister.
--NM="/usr/bin/nm"
-+NM="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-nm"
- 
- # Whether we need soft or hard links.
- LN_S="ln -s"
-@@ -125,6 +116,9 @@ to_host_file_cmd=func_convert_file_noop
- # convert $build files to toolchain format.
- to_tool_file_cmd=func_convert_file_noop
- 
-+# An object symbol dumper.
-+OBJDUMP="i586-openadk-linux-objdump"
-+
- # Method to check whether dependent libraries are shared objects.
- deplibs_check_method="pass_all"
- 
-@@ -137,49 +131,52 @@ file_magic_glob=""
- # Find potential files using nocaseglob when deplibs_check_method = "file_magic".
- want_nocaseglob="no"
- 
-+# DLL creation program.
-+DLLTOOL="false"
-+
- # Command to associate shared and link libraries.
- sharedlib_from_linklib_cmd="printf %s\\n"
- 
- # The archiver.
--AR="ar"
-+AR="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-ar"
- 
- # Flags to create an archive.
- AR_FLAGS="cru"
- 
- # How to feed a file listing to the archiver.
--archiver_list_spec=""
-+archiver_list_spec="@"
- 
- # A symbol stripping program.
--STRIP="strip"
-+STRIP="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-strip"
- 
- # Commands used to install an old-style archive.
--RANLIB="ranlib"
-+RANLIB="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-ranlib"
- old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib"
- old_postuninstall_cmds=""
- 
- # Whether to use a lock for old archive extraction.
--lock_old_archive_extraction=yes
-+lock_old_archive_extraction=no
- 
- # A C compiler.
--LTCC="/usr/bin/gcc-4.2"
-+LTCC="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-gcc -std=gnu99"
- 
- # LTCC compiler flags.
--LTCFLAGS="-O2 -arch x86_64"
-+LTCFLAGS="-march=geode -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i586_eglibc/usr/include/heartbeat -I/Volumes/adk/openadk/target_i586_eglibc/usr/include   -ggdb3 -O0  -fgnu89-inline -Wall -Waggregate-return -Wbad-function-cast -Wcast-align -Wdeclaration-after-statement -Wendif-labels -Wfloat-equal -Wformat=2 -Wformat-security -Wformat-nonliteral -Winline -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wno-long-long -Wno-strict-aliasing -Wpointer-arith -Wstrict-prototypes -Wwrite-strings -Werror"
- 
- # Take the output of nm and produce a listing of raw symbols and C names.
--global_symbol_pipe="sed -n -e 's/^.*[	 ]\\([BCDEGRST][BCDEGRST]*\\)[	 ][	 ]*_\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 _\\2 \\2/p' | sed '/ __gnu_lto/d'"
-+global_symbol_pipe="sed -n -e 's/^.*[	 ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[	 ][	 ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p' | sed '/ __gnu_lto/d'"
- 
- # Transform the output of nm in a proper C declaration.
--global_symbol_to_cdecl="sed -n -e 's/^T .* \\(.*\\)\$/extern int \\1();/p' -e 's/^[BCDEGRST]* .* \\(.*\\)\$/extern char \\1;/p'"
-+global_symbol_to_cdecl="sed -n -e 's/^T .* \\(.*\\)\$/extern int \\1();/p' -e 's/^[ABCDGIRSTW]* .* \\(.*\\)\$/extern char \\1;/p'"
- 
- # Transform the output of nm in a C name address pair.
--global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\)[ ]*\$/  {\\\"\\1\\\", (void *) 0},/p' -e 's/^[BCDEGRST]* \\([^ ]*\\) \\([^ ]*\\)\$/  {\"\\2\", (void *) \\&\\2},/p'"
-+global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\)[ ]*\$/  {\\\"\\1\\\", (void *) 0},/p' -e 's/^[ABCDGIRSTW]* \\([^ ]*\\) \\([^ ]*\\)\$/  {\"\\2\", (void *) \\&\\2},/p'"
- 
- # Transform the output of nm in a C name address pair when lib prefix is needed.
--global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \\([^ ]*\\)[ ]*\$/  {\\\"\\1\\\", (void *) 0},/p' -e 's/^[BCDEGRST]* \\([^ ]*\\) \\(lib[^ ]*\\)\$/  {\"\\2\", (void *) \\&\\2},/p' -e 's/^[BCDEGRST]* \\([^ ]*\\) \\([^ ]*\\)\$/  {\"lib\\2\", (void *) \\&\\2},/p'"
-+global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \\([^ ]*\\)[ ]*\$/  {\\\"\\1\\\", (void *) 0},/p' -e 's/^[ABCDGIRSTW]* \\([^ ]*\\) \\(lib[^ ]*\\)\$/  {\"\\2\", (void *) \\&\\2},/p' -e 's/^[ABCDGIRSTW]* \\([^ ]*\\) \\([^ ]*\\)\$/  {\"lib\\2\", (void *) \\&\\2},/p'"
- 
- # Specify filename containing input files for $NM.
--nm_file_list_spec=""
-+nm_file_list_spec="@"
- 
- # The root where to search for dependent libraries,and in which our libraries should be installed.
- lt_sysroot=
-@@ -197,32 +194,32 @@ need_locks="no"
- MANIFEST_TOOL=":"
- 
- # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
--DSYMUTIL="dsymutil"
-+DSYMUTIL=""
- 
- # Tool to change global to local symbols on Mac OS X.
--NMEDIT="nmedit"
-+NMEDIT=""
- 
- # Tool to manipulate fat objects and archives on Mac OS X.
--LIPO="lipo"
-+LIPO=""
- 
- # ldd/readelf like tool for Mach-O binaries on Mac OS X.
--OTOOL="otool"
-+OTOOL=""
- 
- # ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
--OTOOL64=":"
-+OTOOL64=""
- 
- # Old archive suffix (normally "a").
- libext=a
- 
- # Shared library suffix (normally ".so").
--shrext_cmds="\`test .\$module = .yes && echo .so || echo .dylib\`"
-+shrext_cmds=".so"
- 
- # The commands to extract the exported symbol list from a shared archive.
- extract_expsyms_cmds=""
- 
- # Variables whose values should be saved in libtool wrapper scripts and
- # restored at link time.
--variables_saved_for_relink="PATH DYLD_LIBRARY_PATH  GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-+variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
- 
- # Do we need the "lib" prefix for modules?
- need_lib_prefix=no
-@@ -231,26 +228,26 @@ need_lib_prefix=no
- need_version=no
- 
- # Library versioning type.
--version_type=darwin
-+version_type=linux
- 
- # Shared library runtime path variable.
--runpath_var=
-+runpath_var=LD_RUN_PATH
- 
- # Shared library path variable.
--shlibpath_var=DYLD_LIBRARY_PATH
-+shlibpath_var=LD_LIBRARY_PATH
- 
- # Is shlibpath searched before the hard-coded library search path?
--shlibpath_overrides_runpath=yes
-+shlibpath_overrides_runpath=no
- 
- # Format of library name prefix.
- libname_spec="lib\$name"
- 
- # List of archive names.  First name is the real one, the rest are links.
- # The last name is the one that the linker finds with -lNAME
--library_names_spec="\${libname}\${release}\${major}\$shared_ext \${libname}\$shared_ext"
-+library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}"
- 
- # The coded name of the library, if different from the real name.
--soname_spec="\${libname}\${release}\${major}\$shared_ext"
-+soname_spec="\${libname}\${release}\${shared_ext}\$major"
- 
- # Permission mode override for installation of shared libraries.
- install_override_mode=""
-@@ -262,47 +259,47 @@ postinstall_cmds=""
- postuninstall_cmds=""
- 
- # Commands used to finish a libtool library installation in a directory.
--finish_cmds=""
-+finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir"
- 
- # As "finish_cmds", except a single script fragment to be evaled but
- # not shown.
- finish_eval=""
- 
- # Whether we should hardcode library paths into libraries.
--hardcode_into_libs=no
-+hardcode_into_libs=yes
- 
- # Compile-time system search path for libraries.
--sys_lib_search_path_spec="/usr/lib/gcc/i686-apple-darwin10/4.2.1/x86_64 /usr/lib/i686-apple-darwin10/4.2.1 /usr/lib /opt/local/lib  /usr/local/lib"
-+sys_lib_search_path_spec="/Volumes/adk/openadk/host_i586_eglibc/lib/gcc/i586-openadk-linux-gnu/4.5.3 /Volumes/adk/openadk/host_i586_eglibc/i586-openadk-linux-gnu/lib /Volumes/adk/openadk/target_i586_eglibc/lib /Volumes/adk/openadk/target_i586_eglibc/usr/lib "
- 
- # Run-time system search path for libraries.
--sys_lib_dlsearch_path_spec="/usr/local/lib /lib /usr/lib"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
- 
- # Whether dlopen is supported.
- dlopen_support=yes
- 
- # Whether dlopen of programs is supported.
--dlopen_self=yes
-+dlopen_self=unknown
- 
- # Whether dlopen of statically linked programs is supported.
--dlopen_self_static=yes
-+dlopen_self_static=unknown
- 
- # Commands to strip libraries.
--old_striplib="strip -S"
--striplib="strip -x"
-+old_striplib="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-strip --strip-debug"
-+striplib="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-strip --strip-unneeded"
- 
- 
- # The linker used to build libraries.
--LD="/usr/libexec/gcc/i686-apple-darwin10/4.2.1/ld"
-+LD="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-ld"
- 
- # How to create reloadable object files.
- reload_flag=" -r"
--reload_cmds="\$LTCC \$LTCFLAGS -nostdlib \${wl}-r -o \$output\$reload_objs"
-+reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
- 
- # Commands used to build an old-style archive.
- old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib"
- 
- # A language specific compiler.
--CC="/usr/bin/gcc-4.2"
-+CC="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-gcc -std=gnu99"
- 
- # Is the compiler the GNU compiler?
- with_gcc=yes
-@@ -311,13 +308,13 @@ with_gcc=yes
- no_builtin_flag=" -fno-builtin"
- 
- # Additional compiler flags for building library objects.
--pic_flag=" -fno-common -DPIC"
-+pic_flag=" -fPIC -DPIC"
- 
- # How to pass a linker flag through the compiler.
- wl="-Wl,"
- 
- # Compiler flag to prevent dynamic linking.
--link_static_flag=""
-+link_static_flag="-static"
- 
- # Does compiler simultaneously support -c and -o options?
- compiler_c_o="yes"
-@@ -329,10 +326,10 @@ build_libtool_need_lc=no
- allow_libtool_libs_with_static_runtimes=no
- 
- # Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=""
-+export_dynamic_flag_spec="\${wl}--export-dynamic"
- 
- # Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec="\`for conv in \$convenience\\\"\\\"; do test  -n \\\"\$conv\\\" && new_convenience=\\\"\$new_convenience \${wl}-force_load,\$conv\\\"; done; func_echo_all \\\"\$new_convenience\\\"\`"
-+whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive"
- 
- # Whether the compiler copes with passing no objects directly.
- compiler_needs_object="no"
-@@ -344,26 +341,29 @@ old_archive_from_new_cmds=""
- old_archive_from_expsyms_cmds=""
- 
- # Commands used to build a shared archive.
--archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring \$single_module"
--archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring \$single_module \${wl}-exported_symbols_list,\$output_objdir/\${libname}-symbols.expsym"
-+archive_cmds="\$CC -shared \$pic_flag \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib"
-+archive_expsym_cmds="echo \\\"{ global:\\\" > \$output_objdir/\$libname.ver~
-+	    cat \$export_symbols | sed -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$output_objdir/\$libname.ver~
-+	    echo \\\"local: *; };\\\" >> \$output_objdir/\$libname.ver~
-+	    \$CC -shared \$pic_flag \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-version-script \${wl}\$output_objdir/\$libname.ver -o \$lib"
- 
- # Commands used to build a loadable module if different from building
- # a shared archive.
--module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags"
--module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags \${wl}-exported_symbols_list,\$output_objdir/\${libname}-symbols.expsym"
-+module_cmds=""
-+module_expsym_cmds=""
- 
- # Whether we are building with GNU ld or not.
--with_gnu_ld="no"
-+with_gnu_ld="yes"
- 
- # Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag="\${wl}-undefined \${wl}dynamic_lookup"
-+allow_undefined_flag=""
- 
- # Flag that enforces no undefined symbols.
- no_undefined_flag=""
- 
- # Flag to hardcode $libdir into a binary during linking.
- # This must work even if $libdir does not exist
--hardcode_libdir_flag_spec=""
-+hardcode_libdir_flag_spec="\${wl}-rpath \${wl}\$libdir"
- 
- # If ld is used when linking, flag to hardcode $libdir into a binary
- # during linking.  This must work even if $libdir does not exist.
-@@ -393,14 +393,14 @@ hardcode_shlibpath_var=unsupported
- # Set to "yes" if building a shared library automatically hardcodes DIR
- # into the library and all subsequent libraries and executables linked
- # against it.
--hardcode_automatic=yes
-+hardcode_automatic=no
- 
- # Set to yes if linker adds runtime paths of dependent libraries
- # to runtime path list.
- inherit_rpath=no
- 
- # Whether libtool must link a program against all its dependency libraries.
--link_all_deplibs=yes
-+link_all_deplibs=unknown
- 
- # Set to "yes" if exported symbols are required.
- always_export_symbols=no
-@@ -426,20 +426,6 @@ file_list_spec=""
- # How to hardcode a shared library path into an executable.
- hardcode_action=immediate
- 
--# The directories searched by this compiler when creating a shared library.
--compiler_lib_search_dirs=""
--
--# Dependencies to place before and after the objects being linked to
--# create a shared library.
--predep_objects=""
--postdep_objects=""
--predeps=""
--postdeps=""
--
--# The library search path used internally by the compiler when linking
--# a shared library.
--compiler_lib_search_path=""
--
- # ### END LIBTOOL CONFIG
- 
- 
-@@ -1282,7 +1268,7 @@ exec_cmd=
- # Append VALUE to the end of shell variable VAR.
- func_append ()
- {
--eval "${1}+=\${2}"
-+    eval "${1}+=\${2}"
- } # Extended-shell func_append implementation
- 
- # func_append_quoted var value
-@@ -1298,7 +1284,7 @@ func_append_quoted ()
- # func_arith arithmetic-term...
- func_arith ()
- {
--func_arith_result=$(( $* ))
-+    func_arith_result=$(( $* ))
- } # Extended-shell func_arith implementation
- 
- 
-@@ -1306,7 +1292,7 @@ func_arith_result=$(( $* ))
- # STRING may not start with a hyphen.
- func_len ()
- {
--func_len_result=${#1}
-+    func_len_result=${#1}
- } # Extended-shell func_len implementation
- 
- 
-@@ -1323,7 +1309,7 @@ func_lo2o ()
- # func_xform libobj-or-source
- func_xform ()
- {
--func_xform_result=${1%.*}.lo
-+    func_xform_result=${1%.*}.lo
- } # Extended-shell func_xform implementation
- 
- 
-@@ -10071,768 +10057,3 @@ build_old_libs=`case $build_libtool_libs
- # End:
- # vi:sw=2
- 
--
--# ### BEGIN LIBTOOL TAG CONFIG: CXX
--
--# The linker used to build libraries.
--LD="/usr/libexec/gcc/i686-apple-darwin10/4.2.1/ld"
--
--# How to create reloadable object files.
--reload_flag=" -r"
--reload_cmds="\$LTCC \$LTCFLAGS -nostdlib \${wl}-r -o \$output\$reload_objs"
--
--# Commands used to build an old-style archive.
--old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib"
--
--# A language specific compiler.
--CC="/usr/bin/g++-4.2"
--
--# Is the compiler the GNU compiler?
--with_gcc=yes
--
--# Compiler flag to turn off builtin functions.
--no_builtin_flag=" -fno-builtin"
--
--# Additional compiler flags for building library objects.
--pic_flag=" -fno-common -DPIC"
--
--# How to pass a linker flag through the compiler.
--wl="-Wl,"
--
--# Compiler flag to prevent dynamic linking.
--link_static_flag=""
--
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o="yes"
--
--# Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=no
--
--# Whether or not to disallow shared libs when runtime libs are static.
--allow_libtool_libs_with_static_runtimes=no
--
--# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=""
--
--# Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec="\`for conv in \$convenience\\\"\\\"; do test  -n \\\"\$conv\\\" && new_convenience=\\\"\$new_convenience \${wl}-force_load,\$conv\\\"; done; func_echo_all \\\"\$new_convenience\\\"\`"
--
--# Whether the compiler copes with passing no objects directly.
--compiler_needs_object="no"
--
--# Create an old-style archive from a shared archive.
--old_archive_from_new_cmds=""
--
--# Create a temporary old-style archive to link instead of a shared archive.
--old_archive_from_expsyms_cmds=""
--
--# Commands used to build a shared archive.
--archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring \$single_module"
--archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring \$single_module \${wl}-exported_symbols_list,\$output_objdir/\${libname}-symbols.expsym"
--
--# Commands used to build a loadable module if different from building
--# a shared archive.
--module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags"
--module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags \${wl}-exported_symbols_list,\$output_objdir/\${libname}-symbols.expsym"
--
--# Whether we are building with GNU ld or not.
--with_gnu_ld="no"
--
--# Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag="\${wl}-undefined \${wl}dynamic_lookup"
--
--# Flag that enforces no undefined symbols.
--no_undefined_flag=""
--
--# Flag to hardcode $libdir into a binary during linking.
--# This must work even if $libdir does not exist
--hardcode_libdir_flag_spec=""
--
--# If ld is used when linking, flag to hardcode $libdir into a binary
--# during linking.  This must work even if $libdir does not exist.
--hardcode_libdir_flag_spec_ld=""
--
--# Whether we need a single "-rpath" flag with a separated argument.
--hardcode_libdir_separator=""
--
--# Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
--# DIR into the resulting binary.
--hardcode_direct=no
--
--# Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
--# DIR into the resulting binary and the resulting library dependency is
--# "absolute",i.e impossible to change by setting ${shlibpath_var} if the
--# library is relocated.
--hardcode_direct_absolute=no
--
--# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
--# into the resulting binary.
--hardcode_minus_L=no
--
--# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
--# into the resulting binary.
--hardcode_shlibpath_var=unsupported
--
--# Set to "yes" if building a shared library automatically hardcodes DIR
--# into the library and all subsequent libraries and executables linked
--# against it.
--hardcode_automatic=yes
--
--# Set to yes if linker adds runtime paths of dependent libraries
--# to runtime path list.
--inherit_rpath=no
--
--# Whether libtool must link a program against all its dependency libraries.
--link_all_deplibs=yes
--
--# Set to "yes" if exported symbols are required.
--always_export_symbols=no
--
--# The commands to list exported symbols.
--export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols"
--
--# Symbols that should not be listed in the preloaded symbols.
--exclude_expsyms="_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*"
--
--# Symbols that must always be exported.
--include_expsyms=""
--
--# Commands necessary for linking programs (against libraries) with templates.
--prelink_cmds=""
--
--# Commands necessary for finishing linking programs.
--postlink_cmds=""
--
--# Specify filename containing input files.
--file_list_spec=""
--
--# How to hardcode a shared library path into an executable.
--hardcode_action=immediate
--
--# The directories searched by this compiler when creating a shared library.
--compiler_lib_search_dirs=""
--
--# Dependencies to place before and after the objects being linked to
--# create a shared library.
--predep_objects=""
--postdep_objects=""
--predeps=""
--postdeps=""
--
--# The library search path used internally by the compiler when linking
--# a shared library.
--compiler_lib_search_path=""
--
--# ### END LIBTOOL TAG CONFIG: CXX
--
--# ### BEGIN LIBTOOL TAG CONFIG: F77
--
--# The linker used to build libraries.
--LD=""
--
--# How to create reloadable object files.
--reload_flag=" -r"
--reload_cmds="\$LTCC \$LTCFLAGS -nostdlib \${wl}-r -o \$output\$reload_objs"
--
--# Commands used to build an old-style archive.
--old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib"
--
--# A language specific compiler.
--CC=""
--
--# Is the compiler the GNU compiler?
--with_gcc=
--
--# Compiler flag to turn off builtin functions.
--no_builtin_flag=""
--
--# Additional compiler flags for building library objects.
--pic_flag=""
--
--# How to pass a linker flag through the compiler.
--wl=""
--
--# Compiler flag to prevent dynamic linking.
--link_static_flag=""
--
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o=""
--
--# Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=no
--
--# Whether or not to disallow shared libs when runtime libs are static.
--allow_libtool_libs_with_static_runtimes=no
--
--# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=""
--
--# Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec=""
--
--# Whether the compiler copes with passing no objects directly.
--compiler_needs_object=""
--
--# Create an old-style archive from a shared archive.
--old_archive_from_new_cmds=""
--
--# Create a temporary old-style archive to link instead of a shared archive.
--old_archive_from_expsyms_cmds=""
--
--# Commands used to build a shared archive.
--archive_cmds=""
--archive_expsym_cmds=""
--
--# Commands used to build a loadable module if different from building
--# a shared archive.
--module_cmds=""
--module_expsym_cmds=""
--
--# Whether we are building with GNU ld or not.
--with_gnu_ld=""
--
--# Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag=""
--
--# Flag that enforces no undefined symbols.
--no_undefined_flag=""
--
--# Flag to hardcode $libdir into a binary during linking.
--# This must work even if $libdir does not exist
--hardcode_libdir_flag_spec=""
--
--# If ld is used when linking, flag to hardcode $libdir into a binary
--# during linking.  This must work even if $libdir does not exist.
--hardcode_libdir_flag_spec_ld=""
--
--# Whether we need a single "-rpath" flag with a separated argument.
--hardcode_libdir_separator=""
--
--# Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
--# DIR into the resulting binary.
--hardcode_direct=no
--
--# Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
--# DIR into the resulting binary and the resulting library dependency is
--# "absolute",i.e impossible to change by setting ${shlibpath_var} if the
--# library is relocated.
--hardcode_direct_absolute=no
--
--# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
--# into the resulting binary.
--hardcode_minus_L=no
--
--# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
--# into the resulting binary.
--hardcode_shlibpath_var=
--
--# Set to "yes" if building a shared library automatically hardcodes DIR
--# into the library and all subsequent libraries and executables linked
--# against it.
--hardcode_automatic=no
--
--# Set to yes if linker adds runtime paths of dependent libraries
--# to runtime path list.
--inherit_rpath=no
--
--# Whether libtool must link a program against all its dependency libraries.
--link_all_deplibs=unknown
--
--# Set to "yes" if exported symbols are required.
--always_export_symbols=no
--
--# The commands to list exported symbols.
--export_symbols_cmds=""
--
--# Symbols that should not be listed in the preloaded symbols.
--exclude_expsyms=""
--
--# Symbols that must always be exported.
--include_expsyms=""
--
--# Commands necessary for linking programs (against libraries) with templates.
--prelink_cmds=""
--
--# Commands necessary for finishing linking programs.
--postlink_cmds=""
--
--# Specify filename containing input files.
--file_list_spec=""
--
--# How to hardcode a shared library path into an executable.
--hardcode_action=
--
--# The directories searched by this compiler when creating a shared library.
--compiler_lib_search_dirs=""
--
--# Dependencies to place before and after the objects being linked to
--# create a shared library.
--predep_objects=""
--postdep_objects=""
--predeps=""
--postdeps=""
--
--# The library search path used internally by the compiler when linking
--# a shared library.
--compiler_lib_search_path=""
--
--# ### END LIBTOOL TAG CONFIG: F77
--
--# ### BEGIN LIBTOOL TAG CONFIG: FC
--
--# The linker used to build libraries.
--LD=""
--
--# How to create reloadable object files.
--reload_flag=" -r"
--reload_cmds="\$LTCC \$LTCFLAGS -nostdlib \${wl}-r -o \$output\$reload_objs"
--
--# Commands used to build an old-style archive.
--old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib"
--
--# A language specific compiler.
--CC=""
--
--# Is the compiler the GNU compiler?
--with_gcc=
--
--# Compiler flag to turn off builtin functions.
--no_builtin_flag=""
--
--# Additional compiler flags for building library objects.
--pic_flag=""
--
--# How to pass a linker flag through the compiler.
--wl=""
--
--# Compiler flag to prevent dynamic linking.
--link_static_flag=""
--
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o=""
--
--# Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=no
--
--# Whether or not to disallow shared libs when runtime libs are static.
--allow_libtool_libs_with_static_runtimes=no
--
--# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=""
--
--# Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec=""
--
--# Whether the compiler copes with passing no objects directly.
--compiler_needs_object=""
--
--# Create an old-style archive from a shared archive.
--old_archive_from_new_cmds=""
--
--# Create a temporary old-style archive to link instead of a shared archive.
--old_archive_from_expsyms_cmds=""
--
--# Commands used to build a shared archive.
--archive_cmds=""
--archive_expsym_cmds=""
--
--# Commands used to build a loadable module if different from building
--# a shared archive.
--module_cmds=""
--module_expsym_cmds=""
--
--# Whether we are building with GNU ld or not.
--with_gnu_ld=""
--
--# Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag=""
--
--# Flag that enforces no undefined symbols.
--no_undefined_flag=""
--
--# Flag to hardcode $libdir into a binary during linking.
--# This must work even if $libdir does not exist
--hardcode_libdir_flag_spec=""
--
--# If ld is used when linking, flag to hardcode $libdir into a binary
--# during linking.  This must work even if $libdir does not exist.
--hardcode_libdir_flag_spec_ld=""
--
--# Whether we need a single "-rpath" flag with a separated argument.
--hardcode_libdir_separator=""
--
--# Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
--# DIR into the resulting binary.
--hardcode_direct=no
--
--# Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
--# DIR into the resulting binary and the resulting library dependency is
--# "absolute",i.e impossible to change by setting ${shlibpath_var} if the
--# library is relocated.
--hardcode_direct_absolute=no
--
--# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
--# into the resulting binary.
--hardcode_minus_L=no
--
--# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
--# into the resulting binary.
--hardcode_shlibpath_var=
--
--# Set to "yes" if building a shared library automatically hardcodes DIR
--# into the library and all subsequent libraries and executables linked
--# against it.
--hardcode_automatic=no
--
--# Set to yes if linker adds runtime paths of dependent libraries
--# to runtime path list.
--inherit_rpath=no
--
--# Whether libtool must link a program against all its dependency libraries.
--link_all_deplibs=unknown
--
--# Set to "yes" if exported symbols are required.
--always_export_symbols=no
--
--# The commands to list exported symbols.
--export_symbols_cmds=""
--
--# Symbols that should not be listed in the preloaded symbols.
--exclude_expsyms=""
--
--# Symbols that must always be exported.
--include_expsyms=""
--
--# Commands necessary for linking programs (against libraries) with templates.
--prelink_cmds=""
--
--# Commands necessary for finishing linking programs.
--postlink_cmds=""
--
--# Specify filename containing input files.
--file_list_spec=""
--
--# How to hardcode a shared library path into an executable.
--hardcode_action=
--
--# The directories searched by this compiler when creating a shared library.
--compiler_lib_search_dirs=""
--
--# Dependencies to place before and after the objects being linked to
--# create a shared library.
--predep_objects=""
--postdep_objects=""
--predeps=""
--postdeps=""
--
--# The library search path used internally by the compiler when linking
--# a shared library.
--compiler_lib_search_path=""
--
--# ### END LIBTOOL TAG CONFIG: FC
--
--# ### BEGIN LIBTOOL TAG CONFIG: GCJ
--
--# The linker used to build libraries.
--LD="/usr/libexec/gcc/i686-apple-darwin10/4.2.1/ld"
--
--# How to create reloadable object files.
--reload_flag=" -r"
--reload_cmds="\$LTCC \$LTCFLAGS -nostdlib \${wl}-r -o \$output\$reload_objs"
--
--# Commands used to build an old-style archive.
--old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib"
--
--# A language specific compiler.
--CC=""
--
--# Is the compiler the GNU compiler?
--with_gcc=
--
--# Compiler flag to turn off builtin functions.
--no_builtin_flag=""
--
--# Additional compiler flags for building library objects.
--pic_flag=""
--
--# How to pass a linker flag through the compiler.
--wl=""
--
--# Compiler flag to prevent dynamic linking.
--link_static_flag=""
--
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o=""
--
--# Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=no
--
--# Whether or not to disallow shared libs when runtime libs are static.
--allow_libtool_libs_with_static_runtimes=
--
--# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=""
--
--# Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec=""
--
--# Whether the compiler copes with passing no objects directly.
--compiler_needs_object=""
--
--# Create an old-style archive from a shared archive.
--old_archive_from_new_cmds=""
--
--# Create a temporary old-style archive to link instead of a shared archive.
--old_archive_from_expsyms_cmds=""
--
--# Commands used to build a shared archive.
--archive_cmds=""
--archive_expsym_cmds=""
--
--# Commands used to build a loadable module if different from building
--# a shared archive.
--module_cmds=""
--module_expsym_cmds=""
--
--# Whether we are building with GNU ld or not.
--with_gnu_ld=""
--
--# Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag=""
--
--# Flag that enforces no undefined symbols.
--no_undefined_flag=""
--
--# Flag to hardcode $libdir into a binary during linking.
--# This must work even if $libdir does not exist
--hardcode_libdir_flag_spec=""
--
--# If ld is used when linking, flag to hardcode $libdir into a binary
--# during linking.  This must work even if $libdir does not exist.
--hardcode_libdir_flag_spec_ld=""
--
--# Whether we need a single "-rpath" flag with a separated argument.
--hardcode_libdir_separator=""
--
--# Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
--# DIR into the resulting binary.
--hardcode_direct=
--
--# Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
--# DIR into the resulting binary and the resulting library dependency is
--# "absolute",i.e impossible to change by setting ${shlibpath_var} if the
--# library is relocated.
--hardcode_direct_absolute=
--
--# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
--# into the resulting binary.
--hardcode_minus_L=
--
--# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
--# into the resulting binary.
--hardcode_shlibpath_var=
--
--# Set to "yes" if building a shared library automatically hardcodes DIR
--# into the library and all subsequent libraries and executables linked
--# against it.
--hardcode_automatic=
--
--# Set to yes if linker adds runtime paths of dependent libraries
--# to runtime path list.
--inherit_rpath=
--
--# Whether libtool must link a program against all its dependency libraries.
--link_all_deplibs=
--
--# Set to "yes" if exported symbols are required.
--always_export_symbols=
--
--# The commands to list exported symbols.
--export_symbols_cmds=""
--
--# Symbols that should not be listed in the preloaded symbols.
--exclude_expsyms=""
--
--# Symbols that must always be exported.
--include_expsyms=""
--
--# Commands necessary for linking programs (against libraries) with templates.
--prelink_cmds=""
--
--# Commands necessary for finishing linking programs.
--postlink_cmds=""
--
--# Specify filename containing input files.
--file_list_spec=""
--
--# How to hardcode a shared library path into an executable.
--hardcode_action=
--
--# The directories searched by this compiler when creating a shared library.
--compiler_lib_search_dirs=""
--
--# Dependencies to place before and after the objects being linked to
--# create a shared library.
--predep_objects=""
--postdep_objects=""
--predeps=""
--postdeps=""
--
--# The library search path used internally by the compiler when linking
--# a shared library.
--compiler_lib_search_path=""
--
--# ### END LIBTOOL TAG CONFIG: GCJ
--
--# ### BEGIN LIBTOOL TAG CONFIG: RC
--
--# The linker used to build libraries.
--LD=""
--
--# How to create reloadable object files.
--reload_flag=""
--reload_cmds=""
--
--# Commands used to build an old-style archive.
--old_archive_cmds=""
--
--# A language specific compiler.
--CC=""
--
--# Is the compiler the GNU compiler?
--with_gcc=
--
--# Compiler flag to turn off builtin functions.
--no_builtin_flag=""
--
--# Additional compiler flags for building library objects.
--pic_flag=""
--
--# How to pass a linker flag through the compiler.
--wl=""
--
--# Compiler flag to prevent dynamic linking.
--link_static_flag=""
--
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o="yes"
--
--# Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=
--
--# Whether or not to disallow shared libs when runtime libs are static.
--allow_libtool_libs_with_static_runtimes=
--
--# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=""
--
--# Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec=""
--
--# Whether the compiler copes with passing no objects directly.
--compiler_needs_object=""
--
--# Create an old-style archive from a shared archive.
--old_archive_from_new_cmds=""
--
--# Create a temporary old-style archive to link instead of a shared archive.
--old_archive_from_expsyms_cmds=""
--
--# Commands used to build a shared archive.
--archive_cmds=""
--archive_expsym_cmds=""
--
--# Commands used to build a loadable module if different from building
--# a shared archive.
--module_cmds=""
--module_expsym_cmds=""
--
--# Whether we are building with GNU ld or not.
--with_gnu_ld=""
--
--# Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag=""
--
--# Flag that enforces no undefined symbols.
--no_undefined_flag=""
--
--# Flag to hardcode $libdir into a binary during linking.
--# This must work even if $libdir does not exist
--hardcode_libdir_flag_spec=""
--
--# If ld is used when linking, flag to hardcode $libdir into a binary
--# during linking.  This must work even if $libdir does not exist.
--hardcode_libdir_flag_spec_ld=""
--
--# Whether we need a single "-rpath" flag with a separated argument.
--hardcode_libdir_separator=""
--
--# Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
--# DIR into the resulting binary.
--hardcode_direct=
--
--# Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
--# DIR into the resulting binary and the resulting library dependency is
--# "absolute",i.e impossible to change by setting ${shlibpath_var} if the
--# library is relocated.
--hardcode_direct_absolute=
--
--# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
--# into the resulting binary.
--hardcode_minus_L=
--
--# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
--# into the resulting binary.
--hardcode_shlibpath_var=
--
--# Set to "yes" if building a shared library automatically hardcodes DIR
--# into the library and all subsequent libraries and executables linked
--# against it.
--hardcode_automatic=
--
--# Set to yes if linker adds runtime paths of dependent libraries
--# to runtime path list.
--inherit_rpath=
--
--# Whether libtool must link a program against all its dependency libraries.
--link_all_deplibs=
--
--# Set to "yes" if exported symbols are required.
--always_export_symbols=
--
--# The commands to list exported symbols.
--export_symbols_cmds=""
--
--# Symbols that should not be listed in the preloaded symbols.
--exclude_expsyms=""
--
--# Symbols that must always be exported.
--include_expsyms=""
--
--# Commands necessary for linking programs (against libraries) with templates.
--prelink_cmds=""
--
--# Commands necessary for finishing linking programs.
--postlink_cmds=""
--
--# Specify filename containing input files.
--file_list_spec=""
--
--# How to hardcode a shared library path into an executable.
--hardcode_action=
--
--# The directories searched by this compiler when creating a shared library.
--compiler_lib_search_dirs=""
--
--# Dependencies to place before and after the objects being linked to
--# create a shared library.
--predep_objects=""
--postdep_objects=""
--predeps=""
--postdeps=""
--
--# The library search path used internally by the compiler when linking
--# a shared library.
--compiler_lib_search_path=""
--
--# ### END LIBTOOL TAG CONFIG: RC
diff --git a/package/pacemaker/patches/patch-libtool.orig b/package/pacemaker/patches/patch-libtool.orig
deleted file mode 100644
index 4b01e6895..000000000
--- a/package/pacemaker/patches/patch-libtool.orig
+++ /dev/null
@@ -1,1198 +0,0 @@
---- pacemaker-1.0.11.orig/libtool	2011-04-18 20:21:47.000000000 +0200
-+++ pacemaker-1.0.11/libtool	2011-05-24 17:38:40.000000000 +0200
-@@ -1,7 +1,7 @@
--#! /bin/sh
-+#! /bin/bash
- 
- # libtool - Provide generalized library-building support services.
--# Generated automatically by config.status (libtool) 2.4
-+# Generated automatically by config.status (pacemaker) 1.0.11
- # Libtool was configured on host neon.foo.bar:
- # NOTE: Changes made to this file will be lost: look at ltmain.sh.
- #
-@@ -35,7 +35,7 @@
- 
- 
- # The names of the tagged configurations supported by this script.
--available_tags="CXX F77 FC GCJ RC "
-+available_tags=""
- 
- # ### BEGIN LIBTOOL CONFIG
- 
-@@ -43,15 +43,6 @@ available_tags="CXX F77 FC GCJ RC "
- macro_version=2.4
- macro_revision=1.3293
- 
--# Assembler program.
--AS="as"
--
--# DLL creation program.
--DLLTOOL="false"
--
--# Object dumper program.
--OBJDUMP="false"
--
- # Whether or not to build shared libraries.
- build_libtool_libs=yes
- 
-@@ -62,26 +53,26 @@ build_old_libs=yes
- pic_mode=default
- 
- # Whether or not to optimize for fast installation.
--fast_install=needless
-+fast_install=yes
- 
- # Shell to use when invoking shell scripts.
--SHELL="/bin/sh"
-+SHELL="/bin/bash"
- 
- # An echo program that protects backslashes.
- ECHO="printf %s\\n"
- 
- # The host system.
--host_alias=
--host=x86_64-apple-darwin10.6.0
--host_os=darwin10.6.0
-+host_alias=i586-openadk-linux
-+host=i586-openadk-linux-gnu
-+host_os=linux-gnu
- 
- # The build system.
--build_alias=
--build=x86_64-apple-darwin10.6.0
--build_os=darwin10.6.0
-+build_alias=i686-apple-darwin10
-+build=i686-apple-darwin10
-+build_os=darwin10
- 
- # A sed program that does not truncate output.
--SED="/usr/bin/sed"
-+SED="/Volumes/adk/openadk/scripts/sed"
- 
- # Sed that helps us avoid accidentally triggering echo(1) options like -n.
- Xsed="$SED -e 1s/^X//"
-@@ -96,7 +87,7 @@ EGREP="/usr/bin/grep -E"
- FGREP="/usr/bin/grep -F"
- 
- # A BSD- or MS-compatible name lister.
--NM="/usr/bin/nm"
-+NM="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-nm"
- 
- # Whether we need soft or hard links.
- LN_S="ln -s"
-@@ -125,6 +116,9 @@ to_host_file_cmd=func_convert_file_noop
- # convert $build files to toolchain format.
- to_tool_file_cmd=func_convert_file_noop
- 
-+# An object symbol dumper.
-+OBJDUMP="i586-openadk-linux-objdump"
-+
- # Method to check whether dependent libraries are shared objects.
- deplibs_check_method="pass_all"
- 
-@@ -137,49 +131,52 @@ file_magic_glob=""
- # Find potential files using nocaseglob when deplibs_check_method = "file_magic".
- want_nocaseglob="no"
- 
-+# DLL creation program.
-+DLLTOOL="false"
-+
- # Command to associate shared and link libraries.
- sharedlib_from_linklib_cmd="printf %s\\n"
- 
- # The archiver.
--AR="ar"
-+AR="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-ar"
- 
- # Flags to create an archive.
- AR_FLAGS="cru"
- 
- # How to feed a file listing to the archiver.
--archiver_list_spec=""
-+archiver_list_spec="@"
- 
- # A symbol stripping program.
--STRIP="strip"
-+STRIP="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-strip"
- 
- # Commands used to install an old-style archive.
--RANLIB="ranlib"
-+RANLIB="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-ranlib"
- old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib"
- old_postuninstall_cmds=""
- 
- # Whether to use a lock for old archive extraction.
--lock_old_archive_extraction=yes
-+lock_old_archive_extraction=no
- 
- # A C compiler.
--LTCC="/usr/bin/gcc-4.2"
-+LTCC="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-gcc -std=gnu99"
- 
- # LTCC compiler flags.
--LTCFLAGS="-O2 -arch x86_64"
-+LTCFLAGS="-march=geode -fwrapv -fno-ident -fhonour-copts -fomit-frame-pointer -Os -pipe -I/Volumes/adk/openadk/target_i586_eglibc/usr/include/heartbeat -I/Volumes/adk/openadk/target_i586_eglibc/usr/include   -ggdb3 -O0  -fgnu89-inline -fstack-protector-all -Wall -Waggregate-return -Wbad-function-cast -Wcast-align -Wdeclaration-after-statement -Wendif-labels -Wfloat-equal -Wformat=2 -Wformat-security -Wformat-nonliteral -Winline -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wno-long-long -Wno-strict-aliasing -Wpointer-arith -Wstrict-prototypes -Wwrite-strings -Werror"
- 
- # Take the output of nm and produce a listing of raw symbols and C names.
--global_symbol_pipe="sed -n -e 's/^.*[	 ]\\([BCDEGRST][BCDEGRST]*\\)[	 ][	 ]*_\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 _\\2 \\2/p' | sed '/ __gnu_lto/d'"
-+global_symbol_pipe="sed -n -e 's/^.*[	 ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[	 ][	 ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p' | sed '/ __gnu_lto/d'"
- 
- # Transform the output of nm in a proper C declaration.
--global_symbol_to_cdecl="sed -n -e 's/^T .* \\(.*\\)\$/extern int \\1();/p' -e 's/^[BCDEGRST]* .* \\(.*\\)\$/extern char \\1;/p'"
-+global_symbol_to_cdecl="sed -n -e 's/^T .* \\(.*\\)\$/extern int \\1();/p' -e 's/^[ABCDGIRSTW]* .* \\(.*\\)\$/extern char \\1;/p'"
- 
- # Transform the output of nm in a C name address pair.
--global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\)[ ]*\$/  {\\\"\\1\\\", (void *) 0},/p' -e 's/^[BCDEGRST]* \\([^ ]*\\) \\([^ ]*\\)\$/  {\"\\2\", (void *) \\&\\2},/p'"
-+global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\)[ ]*\$/  {\\\"\\1\\\", (void *) 0},/p' -e 's/^[ABCDGIRSTW]* \\([^ ]*\\) \\([^ ]*\\)\$/  {\"\\2\", (void *) \\&\\2},/p'"
- 
- # Transform the output of nm in a C name address pair when lib prefix is needed.
--global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \\([^ ]*\\)[ ]*\$/  {\\\"\\1\\\", (void *) 0},/p' -e 's/^[BCDEGRST]* \\([^ ]*\\) \\(lib[^ ]*\\)\$/  {\"\\2\", (void *) \\&\\2},/p' -e 's/^[BCDEGRST]* \\([^ ]*\\) \\([^ ]*\\)\$/  {\"lib\\2\", (void *) \\&\\2},/p'"
-+global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \\([^ ]*\\)[ ]*\$/  {\\\"\\1\\\", (void *) 0},/p' -e 's/^[ABCDGIRSTW]* \\([^ ]*\\) \\(lib[^ ]*\\)\$/  {\"\\2\", (void *) \\&\\2},/p' -e 's/^[ABCDGIRSTW]* \\([^ ]*\\) \\([^ ]*\\)\$/  {\"lib\\2\", (void *) \\&\\2},/p'"
- 
- # Specify filename containing input files for $NM.
--nm_file_list_spec=""
-+nm_file_list_spec="@"
- 
- # The root where to search for dependent libraries,and in which our libraries should be installed.
- lt_sysroot=
-@@ -197,32 +194,32 @@ need_locks="no"
- MANIFEST_TOOL=":"
- 
- # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
--DSYMUTIL="dsymutil"
-+DSYMUTIL=""
- 
- # Tool to change global to local symbols on Mac OS X.
--NMEDIT="nmedit"
-+NMEDIT=""
- 
- # Tool to manipulate fat objects and archives on Mac OS X.
--LIPO="lipo"
-+LIPO=""
- 
- # ldd/readelf like tool for Mach-O binaries on Mac OS X.
--OTOOL="otool"
-+OTOOL=""
- 
- # ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
--OTOOL64=":"
-+OTOOL64=""
- 
- # Old archive suffix (normally "a").
- libext=a
- 
- # Shared library suffix (normally ".so").
--shrext_cmds="\`test .\$module = .yes && echo .so || echo .dylib\`"
-+shrext_cmds=".so"
- 
- # The commands to extract the exported symbol list from a shared archive.
- extract_expsyms_cmds=""
- 
- # Variables whose values should be saved in libtool wrapper scripts and
- # restored at link time.
--variables_saved_for_relink="PATH DYLD_LIBRARY_PATH  GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-+variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
- 
- # Do we need the "lib" prefix for modules?
- need_lib_prefix=no
-@@ -231,26 +228,26 @@ need_lib_prefix=no
- need_version=no
- 
- # Library versioning type.
--version_type=darwin
-+version_type=linux
- 
- # Shared library runtime path variable.
--runpath_var=
-+runpath_var=LD_RUN_PATH
- 
- # Shared library path variable.
--shlibpath_var=DYLD_LIBRARY_PATH
-+shlibpath_var=LD_LIBRARY_PATH
- 
- # Is shlibpath searched before the hard-coded library search path?
--shlibpath_overrides_runpath=yes
-+shlibpath_overrides_runpath=no
- 
- # Format of library name prefix.
- libname_spec="lib\$name"
- 
- # List of archive names.  First name is the real one, the rest are links.
- # The last name is the one that the linker finds with -lNAME
--library_names_spec="\${libname}\${release}\${major}\$shared_ext \${libname}\$shared_ext"
-+library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}"
- 
- # The coded name of the library, if different from the real name.
--soname_spec="\${libname}\${release}\${major}\$shared_ext"
-+soname_spec="\${libname}\${release}\${shared_ext}\$major"
- 
- # Permission mode override for installation of shared libraries.
- install_override_mode=""
-@@ -262,47 +259,47 @@ postinstall_cmds=""
- postuninstall_cmds=""
- 
- # Commands used to finish a libtool library installation in a directory.
--finish_cmds=""
-+finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir"
- 
- # As "finish_cmds", except a single script fragment to be evaled but
- # not shown.
- finish_eval=""
- 
- # Whether we should hardcode library paths into libraries.
--hardcode_into_libs=no
-+hardcode_into_libs=yes
- 
- # Compile-time system search path for libraries.
--sys_lib_search_path_spec="/usr/lib/gcc/i686-apple-darwin10/4.2.1/x86_64 /usr/lib/i686-apple-darwin10/4.2.1 /usr/lib /opt/local/lib  /usr/local/lib"
-+sys_lib_search_path_spec="/Volumes/adk/openadk/host_i586_eglibc/lib/gcc/i586-openadk-linux-gnu/4.5.3 /Volumes/adk/openadk/host_i586_eglibc/i586-openadk-linux-gnu/lib /Volumes/adk/openadk/target_i586_eglibc/lib /Volumes/adk/openadk/target_i586_eglibc/usr/lib "
- 
- # Run-time system search path for libraries.
--sys_lib_dlsearch_path_spec="/usr/local/lib /lib /usr/lib"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
- 
- # Whether dlopen is supported.
- dlopen_support=yes
- 
- # Whether dlopen of programs is supported.
--dlopen_self=yes
-+dlopen_self=unknown
- 
- # Whether dlopen of statically linked programs is supported.
--dlopen_self_static=yes
-+dlopen_self_static=unknown
- 
- # Commands to strip libraries.
--old_striplib="strip -S"
--striplib="strip -x"
-+old_striplib="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-strip --strip-debug"
-+striplib="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-strip --strip-unneeded"
- 
- 
- # The linker used to build libraries.
--LD="/usr/libexec/gcc/i686-apple-darwin10/4.2.1/ld"
-+LD="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-ld"
- 
- # How to create reloadable object files.
- reload_flag=" -r"
--reload_cmds="\$LTCC \$LTCFLAGS -nostdlib \${wl}-r -o \$output\$reload_objs"
-+reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
- 
- # Commands used to build an old-style archive.
- old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib"
- 
- # A language specific compiler.
--CC="/usr/bin/gcc-4.2"
-+CC="/Volumes/adk/openadk/host_i586_eglibc/bin/i586-openadk-linux-gnu-gcc -std=gnu99"
- 
- # Is the compiler the GNU compiler?
- with_gcc=yes
-@@ -311,13 +308,13 @@ with_gcc=yes
- no_builtin_flag=" -fno-builtin"
- 
- # Additional compiler flags for building library objects.
--pic_flag=" -fno-common -DPIC"
-+pic_flag=" -fPIC -DPIC"
- 
- # How to pass a linker flag through the compiler.
- wl="-Wl,"
- 
- # Compiler flag to prevent dynamic linking.
--link_static_flag=""
-+link_static_flag="-static"
- 
- # Does compiler simultaneously support -c and -o options?
- compiler_c_o="yes"
-@@ -329,10 +326,10 @@ build_libtool_need_lc=no
- allow_libtool_libs_with_static_runtimes=no
- 
- # Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=""
-+export_dynamic_flag_spec="\${wl}--export-dynamic"
- 
- # Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec="\`for conv in \$convenience\\\"\\\"; do test  -n \\\"\$conv\\\" && new_convenience=\\\"\$new_convenience \${wl}-force_load,\$conv\\\"; done; func_echo_all \\\"\$new_convenience\\\"\`"
-+whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive"
- 
- # Whether the compiler copes with passing no objects directly.
- compiler_needs_object="no"
-@@ -344,26 +341,29 @@ old_archive_from_new_cmds=""
- old_archive_from_expsyms_cmds=""
- 
- # Commands used to build a shared archive.
--archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring \$single_module"
--archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring \$single_module \${wl}-exported_symbols_list,\$output_objdir/\${libname}-symbols.expsym"
-+archive_cmds="\$CC -shared \$pic_flag \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib"
-+archive_expsym_cmds="echo \\\"{ global:\\\" > \$output_objdir/\$libname.ver~
-+	    cat \$export_symbols | sed -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$output_objdir/\$libname.ver~
-+	    echo \\\"local: *; };\\\" >> \$output_objdir/\$libname.ver~
-+	    \$CC -shared \$pic_flag \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-version-script \${wl}\$output_objdir/\$libname.ver -o \$lib"
- 
- # Commands used to build a loadable module if different from building
- # a shared archive.
--module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags"
--module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags \${wl}-exported_symbols_list,\$output_objdir/\${libname}-symbols.expsym"
-+module_cmds=""
-+module_expsym_cmds=""
- 
- # Whether we are building with GNU ld or not.
--with_gnu_ld="no"
-+with_gnu_ld="yes"
- 
- # Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag="\${wl}-undefined \${wl}dynamic_lookup"
-+allow_undefined_flag=""
- 
- # Flag that enforces no undefined symbols.
- no_undefined_flag=""
- 
- # Flag to hardcode $libdir into a binary during linking.
- # This must work even if $libdir does not exist
--hardcode_libdir_flag_spec=""
-+hardcode_libdir_flag_spec="\${wl}-rpath \${wl}\$libdir"
- 
- # If ld is used when linking, flag to hardcode $libdir into a binary
- # during linking.  This must work even if $libdir does not exist.
-@@ -393,14 +393,14 @@ hardcode_shlibpath_var=unsupported
- # Set to "yes" if building a shared library automatically hardcodes DIR
- # into the library and all subsequent libraries and executables linked
- # against it.
--hardcode_automatic=yes
-+hardcode_automatic=no
- 
- # Set to yes if linker adds runtime paths of dependent libraries
- # to runtime path list.
- inherit_rpath=no
- 
- # Whether libtool must link a program against all its dependency libraries.
--link_all_deplibs=yes
-+link_all_deplibs=unknown
- 
- # Set to "yes" if exported symbols are required.
- always_export_symbols=no
-@@ -426,20 +426,6 @@ file_list_spec=""
- # How to hardcode a shared library path into an executable.
- hardcode_action=immediate
- 
--# The directories searched by this compiler when creating a shared library.
--compiler_lib_search_dirs=""
--
--# Dependencies to place before and after the objects being linked to
--# create a shared library.
--predep_objects=""
--postdep_objects=""
--predeps=""
--postdeps=""
--
--# The library search path used internally by the compiler when linking
--# a shared library.
--compiler_lib_search_path=""
--
- # ### END LIBTOOL CONFIG
- 
- 
-@@ -1282,7 +1268,7 @@ exec_cmd=
- # Append VALUE to the end of shell variable VAR.
- func_append ()
- {
--eval "${1}+=\${2}"
-+    eval "${1}+=\${2}"
- } # Extended-shell func_append implementation
- 
- # func_append_quoted var value
-@@ -1298,7 +1284,7 @@ func_append_quoted ()
- # func_arith arithmetic-term...
- func_arith ()
- {
--func_arith_result=$(( $* ))
-+    func_arith_result=$(( $* ))
- } # Extended-shell func_arith implementation
- 
- 
-@@ -1306,7 +1292,7 @@ func_arith_result=$(( $* ))
- # STRING may not start with a hyphen.
- func_len ()
- {
--func_len_result=${#1}
-+    func_len_result=${#1}
- } # Extended-shell func_len implementation
- 
- 
-@@ -1323,7 +1309,7 @@ func_lo2o ()
- # func_xform libobj-or-source
- func_xform ()
- {
--func_xform_result=${1%.*}.lo
-+    func_xform_result=${1%.*}.lo
- } # Extended-shell func_xform implementation
- 
- 
-@@ -10071,768 +10057,3 @@ build_old_libs=`case $build_libtool_libs
- # End:
- # vi:sw=2
- 
--
--# ### BEGIN LIBTOOL TAG CONFIG: CXX
--
--# The linker used to build libraries.
--LD="/usr/libexec/gcc/i686-apple-darwin10/4.2.1/ld"
--
--# How to create reloadable object files.
--reload_flag=" -r"
--reload_cmds="\$LTCC \$LTCFLAGS -nostdlib \${wl}-r -o \$output\$reload_objs"
--
--# Commands used to build an old-style archive.
--old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib"
--
--# A language specific compiler.
--CC="/usr/bin/g++-4.2"
--
--# Is the compiler the GNU compiler?
--with_gcc=yes
--
--# Compiler flag to turn off builtin functions.
--no_builtin_flag=" -fno-builtin"
--
--# Additional compiler flags for building library objects.
--pic_flag=" -fno-common -DPIC"
--
--# How to pass a linker flag through the compiler.
--wl="-Wl,"
--
--# Compiler flag to prevent dynamic linking.
--link_static_flag=""
--
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o="yes"
--
--# Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=no
--
--# Whether or not to disallow shared libs when runtime libs are static.
--allow_libtool_libs_with_static_runtimes=no
--
--# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=""
--
--# Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec="\`for conv in \$convenience\\\"\\\"; do test  -n \\\"\$conv\\\" && new_convenience=\\\"\$new_convenience \${wl}-force_load,\$conv\\\"; done; func_echo_all \\\"\$new_convenience\\\"\`"
--
--# Whether the compiler copes with passing no objects directly.
--compiler_needs_object="no"
--
--# Create an old-style archive from a shared archive.
--old_archive_from_new_cmds=""
--
--# Create a temporary old-style archive to link instead of a shared archive.
--old_archive_from_expsyms_cmds=""
--
--# Commands used to build a shared archive.
--archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring \$single_module"
--archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring \$single_module \${wl}-exported_symbols_list,\$output_objdir/\${libname}-symbols.expsym"
--
--# Commands used to build a loadable module if different from building
--# a shared archive.
--module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags"
--module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags \${wl}-exported_symbols_list,\$output_objdir/\${libname}-symbols.expsym"
--
--# Whether we are building with GNU ld or not.
--with_gnu_ld="no"
--
--# Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag="\${wl}-undefined \${wl}dynamic_lookup"
--
--# Flag that enforces no undefined symbols.
--no_undefined_flag=""
--
--# Flag to hardcode $libdir into a binary during linking.
--# This must work even if $libdir does not exist
--hardcode_libdir_flag_spec=""
--
--# If ld is used when linking, flag to hardcode $libdir into a binary
--# during linking.  This must work even if $libdir does not exist.
--hardcode_libdir_flag_spec_ld=""
--
--# Whether we need a single "-rpath" flag with a separated argument.
--hardcode_libdir_separator=""
--
--# Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
--# DIR into the resulting binary.
--hardcode_direct=no
--
--# Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
--# DIR into the resulting binary and the resulting library dependency is
--# "absolute",i.e impossible to change by setting ${shlibpath_var} if the
--# library is relocated.
--hardcode_direct_absolute=no
--
--# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
--# into the resulting binary.
--hardcode_minus_L=no
--
--# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
--# into the resulting binary.
--hardcode_shlibpath_var=unsupported
--
--# Set to "yes" if building a shared library automatically hardcodes DIR
--# into the library and all subsequent libraries and executables linked
--# against it.
--hardcode_automatic=yes
--
--# Set to yes if linker adds runtime paths of dependent libraries
--# to runtime path list.
--inherit_rpath=no
--
--# Whether libtool must link a program against all its dependency libraries.
--link_all_deplibs=yes
--
--# Set to "yes" if exported symbols are required.
--always_export_symbols=no
--
--# The commands to list exported symbols.
--export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols"
--
--# Symbols that should not be listed in the preloaded symbols.
--exclude_expsyms="_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*"
--
--# Symbols that must always be exported.
--include_expsyms=""
--
--# Commands necessary for linking programs (against libraries) with templates.
--prelink_cmds=""
--
--# Commands necessary for finishing linking programs.
--postlink_cmds=""
--
--# Specify filename containing input files.
--file_list_spec=""
--
--# How to hardcode a shared library path into an executable.
--hardcode_action=immediate
--
--# The directories searched by this compiler when creating a shared library.
--compiler_lib_search_dirs=""
--
--# Dependencies to place before and after the objects being linked to
--# create a shared library.
--predep_objects=""
--postdep_objects=""
--predeps=""
--postdeps=""
--
--# The library search path used internally by the compiler when linking
--# a shared library.
--compiler_lib_search_path=""
--
--# ### END LIBTOOL TAG CONFIG: CXX
--
--# ### BEGIN LIBTOOL TAG CONFIG: F77
--
--# The linker used to build libraries.
--LD=""
--
--# How to create reloadable object files.
--reload_flag=" -r"
--reload_cmds="\$LTCC \$LTCFLAGS -nostdlib \${wl}-r -o \$output\$reload_objs"
--
--# Commands used to build an old-style archive.
--old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib"
--
--# A language specific compiler.
--CC=""
--
--# Is the compiler the GNU compiler?
--with_gcc=
--
--# Compiler flag to turn off builtin functions.
--no_builtin_flag=""
--
--# Additional compiler flags for building library objects.
--pic_flag=""
--
--# How to pass a linker flag through the compiler.
--wl=""
--
--# Compiler flag to prevent dynamic linking.
--link_static_flag=""
--
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o=""
--
--# Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=no
--
--# Whether or not to disallow shared libs when runtime libs are static.
--allow_libtool_libs_with_static_runtimes=no
--
--# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=""
--
--# Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec=""
--
--# Whether the compiler copes with passing no objects directly.
--compiler_needs_object=""
--
--# Create an old-style archive from a shared archive.
--old_archive_from_new_cmds=""
--
--# Create a temporary old-style archive to link instead of a shared archive.
--old_archive_from_expsyms_cmds=""
--
--# Commands used to build a shared archive.
--archive_cmds=""
--archive_expsym_cmds=""
--
--# Commands used to build a loadable module if different from building
--# a shared archive.
--module_cmds=""
--module_expsym_cmds=""
--
--# Whether we are building with GNU ld or not.
--with_gnu_ld=""
--
--# Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag=""
--
--# Flag that enforces no undefined symbols.
--no_undefined_flag=""
--
--# Flag to hardcode $libdir into a binary during linking.
--# This must work even if $libdir does not exist
--hardcode_libdir_flag_spec=""
--
--# If ld is used when linking, flag to hardcode $libdir into a binary
--# during linking.  This must work even if $libdir does not exist.
--hardcode_libdir_flag_spec_ld=""
--
--# Whether we need a single "-rpath" flag with a separated argument.
--hardcode_libdir_separator=""
--
--# Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
--# DIR into the resulting binary.
--hardcode_direct=no
--
--# Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
--# DIR into the resulting binary and the resulting library dependency is
--# "absolute",i.e impossible to change by setting ${shlibpath_var} if the
--# library is relocated.
--hardcode_direct_absolute=no
--
--# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
--# into the resulting binary.
--hardcode_minus_L=no
--
--# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
--# into the resulting binary.
--hardcode_shlibpath_var=
--
--# Set to "yes" if building a shared library automatically hardcodes DIR
--# into the library and all subsequent libraries and executables linked
--# against it.
--hardcode_automatic=no
--
--# Set to yes if linker adds runtime paths of dependent libraries
--# to runtime path list.
--inherit_rpath=no
--
--# Whether libtool must link a program against all its dependency libraries.
--link_all_deplibs=unknown
--
--# Set to "yes" if exported symbols are required.
--always_export_symbols=no
--
--# The commands to list exported symbols.
--export_symbols_cmds=""
--
--# Symbols that should not be listed in the preloaded symbols.
--exclude_expsyms=""
--
--# Symbols that must always be exported.
--include_expsyms=""
--
--# Commands necessary for linking programs (against libraries) with templates.
--prelink_cmds=""
--
--# Commands necessary for finishing linking programs.
--postlink_cmds=""
--
--# Specify filename containing input files.
--file_list_spec=""
--
--# How to hardcode a shared library path into an executable.
--hardcode_action=
--
--# The directories searched by this compiler when creating a shared library.
--compiler_lib_search_dirs=""
--
--# Dependencies to place before and after the objects being linked to
--# create a shared library.
--predep_objects=""
--postdep_objects=""
--predeps=""
--postdeps=""
--
--# The library search path used internally by the compiler when linking
--# a shared library.
--compiler_lib_search_path=""
--
--# ### END LIBTOOL TAG CONFIG: F77
--
--# ### BEGIN LIBTOOL TAG CONFIG: FC
--
--# The linker used to build libraries.
--LD=""
--
--# How to create reloadable object files.
--reload_flag=" -r"
--reload_cmds="\$LTCC \$LTCFLAGS -nostdlib \${wl}-r -o \$output\$reload_objs"
--
--# Commands used to build an old-style archive.
--old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib"
--
--# A language specific compiler.
--CC=""
--
--# Is the compiler the GNU compiler?
--with_gcc=
--
--# Compiler flag to turn off builtin functions.
--no_builtin_flag=""
--
--# Additional compiler flags for building library objects.
--pic_flag=""
--
--# How to pass a linker flag through the compiler.
--wl=""
--
--# Compiler flag to prevent dynamic linking.
--link_static_flag=""
--
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o=""
--
--# Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=no
--
--# Whether or not to disallow shared libs when runtime libs are static.
--allow_libtool_libs_with_static_runtimes=no
--
--# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=""
--
--# Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec=""
--
--# Whether the compiler copes with passing no objects directly.
--compiler_needs_object=""
--
--# Create an old-style archive from a shared archive.
--old_archive_from_new_cmds=""
--
--# Create a temporary old-style archive to link instead of a shared archive.
--old_archive_from_expsyms_cmds=""
--
--# Commands used to build a shared archive.
--archive_cmds=""
--archive_expsym_cmds=""
--
--# Commands used to build a loadable module if different from building
--# a shared archive.
--module_cmds=""
--module_expsym_cmds=""
--
--# Whether we are building with GNU ld or not.
--with_gnu_ld=""
--
--# Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag=""
--
--# Flag that enforces no undefined symbols.
--no_undefined_flag=""
--
--# Flag to hardcode $libdir into a binary during linking.
--# This must work even if $libdir does not exist
--hardcode_libdir_flag_spec=""
--
--# If ld is used when linking, flag to hardcode $libdir into a binary
--# during linking.  This must work even if $libdir does not exist.
--hardcode_libdir_flag_spec_ld=""
--
--# Whether we need a single "-rpath" flag with a separated argument.
--hardcode_libdir_separator=""
--
--# Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
--# DIR into the resulting binary.
--hardcode_direct=no
--
--# Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
--# DIR into the resulting binary and the resulting library dependency is
--# "absolute",i.e impossible to change by setting ${shlibpath_var} if the
--# library is relocated.
--hardcode_direct_absolute=no
--
--# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
--# into the resulting binary.
--hardcode_minus_L=no
--
--# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
--# into the resulting binary.
--hardcode_shlibpath_var=
--
--# Set to "yes" if building a shared library automatically hardcodes DIR
--# into the library and all subsequent libraries and executables linked
--# against it.
--hardcode_automatic=no
--
--# Set to yes if linker adds runtime paths of dependent libraries
--# to runtime path list.
--inherit_rpath=no
--
--# Whether libtool must link a program against all its dependency libraries.
--link_all_deplibs=unknown
--
--# Set to "yes" if exported symbols are required.
--always_export_symbols=no
--
--# The commands to list exported symbols.
--export_symbols_cmds=""
--
--# Symbols that should not be listed in the preloaded symbols.
--exclude_expsyms=""
--
--# Symbols that must always be exported.
--include_expsyms=""
--
--# Commands necessary for linking programs (against libraries) with templates.
--prelink_cmds=""
--
--# Commands necessary for finishing linking programs.
--postlink_cmds=""
--
--# Specify filename containing input files.
--file_list_spec=""
--
--# How to hardcode a shared library path into an executable.
--hardcode_action=
--
--# The directories searched by this compiler when creating a shared library.
--compiler_lib_search_dirs=""
--
--# Dependencies to place before and after the objects being linked to
--# create a shared library.
--predep_objects=""
--postdep_objects=""
--predeps=""
--postdeps=""
--
--# The library search path used internally by the compiler when linking
--# a shared library.
--compiler_lib_search_path=""
--
--# ### END LIBTOOL TAG CONFIG: FC
--
--# ### BEGIN LIBTOOL TAG CONFIG: GCJ
--
--# The linker used to build libraries.
--LD="/usr/libexec/gcc/i686-apple-darwin10/4.2.1/ld"
--
--# How to create reloadable object files.
--reload_flag=" -r"
--reload_cmds="\$LTCC \$LTCFLAGS -nostdlib \${wl}-r -o \$output\$reload_objs"
--
--# Commands used to build an old-style archive.
--old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib"
--
--# A language specific compiler.
--CC=""
--
--# Is the compiler the GNU compiler?
--with_gcc=
--
--# Compiler flag to turn off builtin functions.
--no_builtin_flag=""
--
--# Additional compiler flags for building library objects.
--pic_flag=""
--
--# How to pass a linker flag through the compiler.
--wl=""
--
--# Compiler flag to prevent dynamic linking.
--link_static_flag=""
--
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o=""
--
--# Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=no
--
--# Whether or not to disallow shared libs when runtime libs are static.
--allow_libtool_libs_with_static_runtimes=
--
--# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=""
--
--# Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec=""
--
--# Whether the compiler copes with passing no objects directly.
--compiler_needs_object=""
--
--# Create an old-style archive from a shared archive.
--old_archive_from_new_cmds=""
--
--# Create a temporary old-style archive to link instead of a shared archive.
--old_archive_from_expsyms_cmds=""
--
--# Commands used to build a shared archive.
--archive_cmds=""
--archive_expsym_cmds=""
--
--# Commands used to build a loadable module if different from building
--# a shared archive.
--module_cmds=""
--module_expsym_cmds=""
--
--# Whether we are building with GNU ld or not.
--with_gnu_ld=""
--
--# Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag=""
--
--# Flag that enforces no undefined symbols.
--no_undefined_flag=""
--
--# Flag to hardcode $libdir into a binary during linking.
--# This must work even if $libdir does not exist
--hardcode_libdir_flag_spec=""
--
--# If ld is used when linking, flag to hardcode $libdir into a binary
--# during linking.  This must work even if $libdir does not exist.
--hardcode_libdir_flag_spec_ld=""
--
--# Whether we need a single "-rpath" flag with a separated argument.
--hardcode_libdir_separator=""
--
--# Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
--# DIR into the resulting binary.
--hardcode_direct=
--
--# Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
--# DIR into the resulting binary and the resulting library dependency is
--# "absolute",i.e impossible to change by setting ${shlibpath_var} if the
--# library is relocated.
--hardcode_direct_absolute=
--
--# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
--# into the resulting binary.
--hardcode_minus_L=
--
--# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
--# into the resulting binary.
--hardcode_shlibpath_var=
--
--# Set to "yes" if building a shared library automatically hardcodes DIR
--# into the library and all subsequent libraries and executables linked
--# against it.
--hardcode_automatic=
--
--# Set to yes if linker adds runtime paths of dependent libraries
--# to runtime path list.
--inherit_rpath=
--
--# Whether libtool must link a program against all its dependency libraries.
--link_all_deplibs=
--
--# Set to "yes" if exported symbols are required.
--always_export_symbols=
--
--# The commands to list exported symbols.
--export_symbols_cmds=""
--
--# Symbols that should not be listed in the preloaded symbols.
--exclude_expsyms=""
--
--# Symbols that must always be exported.
--include_expsyms=""
--
--# Commands necessary for linking programs (against libraries) with templates.
--prelink_cmds=""
--
--# Commands necessary for finishing linking programs.
--postlink_cmds=""
--
--# Specify filename containing input files.
--file_list_spec=""
--
--# How to hardcode a shared library path into an executable.
--hardcode_action=
--
--# The directories searched by this compiler when creating a shared library.
--compiler_lib_search_dirs=""
--
--# Dependencies to place before and after the objects being linked to
--# create a shared library.
--predep_objects=""
--postdep_objects=""
--predeps=""
--postdeps=""
--
--# The library search path used internally by the compiler when linking
--# a shared library.
--compiler_lib_search_path=""
--
--# ### END LIBTOOL TAG CONFIG: GCJ
--
--# ### BEGIN LIBTOOL TAG CONFIG: RC
--
--# The linker used to build libraries.
--LD=""
--
--# How to create reloadable object files.
--reload_flag=""
--reload_cmds=""
--
--# Commands used to build an old-style archive.
--old_archive_cmds=""
--
--# A language specific compiler.
--CC=""
--
--# Is the compiler the GNU compiler?
--with_gcc=
--
--# Compiler flag to turn off builtin functions.
--no_builtin_flag=""
--
--# Additional compiler flags for building library objects.
--pic_flag=""
--
--# How to pass a linker flag through the compiler.
--wl=""
--
--# Compiler flag to prevent dynamic linking.
--link_static_flag=""
--
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o="yes"
--
--# Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=
--
--# Whether or not to disallow shared libs when runtime libs are static.
--allow_libtool_libs_with_static_runtimes=
--
--# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=""
--
--# Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec=""
--
--# Whether the compiler copes with passing no objects directly.
--compiler_needs_object=""
--
--# Create an old-style archive from a shared archive.
--old_archive_from_new_cmds=""
--
--# Create a temporary old-style archive to link instead of a shared archive.
--old_archive_from_expsyms_cmds=""
--
--# Commands used to build a shared archive.
--archive_cmds=""
--archive_expsym_cmds=""
--
--# Commands used to build a loadable module if different from building
--# a shared archive.
--module_cmds=""
--module_expsym_cmds=""
--
--# Whether we are building with GNU ld or not.
--with_gnu_ld=""
--
--# Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag=""
--
--# Flag that enforces no undefined symbols.
--no_undefined_flag=""
--
--# Flag to hardcode $libdir into a binary during linking.
--# This must work even if $libdir does not exist
--hardcode_libdir_flag_spec=""
--
--# If ld is used when linking, flag to hardcode $libdir into a binary
--# during linking.  This must work even if $libdir does not exist.
--hardcode_libdir_flag_spec_ld=""
--
--# Whether we need a single "-rpath" flag with a separated argument.
--hardcode_libdir_separator=""
--
--# Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
--# DIR into the resulting binary.
--hardcode_direct=
--
--# Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
--# DIR into the resulting binary and the resulting library dependency is
--# "absolute",i.e impossible to change by setting ${shlibpath_var} if the
--# library is relocated.
--hardcode_direct_absolute=
--
--# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
--# into the resulting binary.
--hardcode_minus_L=
--
--# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
--# into the resulting binary.
--hardcode_shlibpath_var=
--
--# Set to "yes" if building a shared library automatically hardcodes DIR
--# into the library and all subsequent libraries and executables linked
--# against it.
--hardcode_automatic=
--
--# Set to yes if linker adds runtime paths of dependent libraries
--# to runtime path list.
--inherit_rpath=
--
--# Whether libtool must link a program against all its dependency libraries.
--link_all_deplibs=
--
--# Set to "yes" if exported symbols are required.
--always_export_symbols=
--
--# The commands to list exported symbols.
--export_symbols_cmds=""
--
--# Symbols that should not be listed in the preloaded symbols.
--exclude_expsyms=""
--
--# Symbols that must always be exported.
--include_expsyms=""
--
--# Commands necessary for linking programs (against libraries) with templates.
--prelink_cmds=""
--
--# Commands necessary for finishing linking programs.
--postlink_cmds=""
--
--# Specify filename containing input files.
--file_list_spec=""
--
--# How to hardcode a shared library path into an executable.
--hardcode_action=
--
--# The directories searched by this compiler when creating a shared library.
--compiler_lib_search_dirs=""
--
--# Dependencies to place before and after the objects being linked to
--# create a shared library.
--predep_objects=""
--postdep_objects=""
--predeps=""
--postdeps=""
--
--# The library search path used internally by the compiler when linking
--# a shared library.
--compiler_lib_search_path=""
--
--# ### END LIBTOOL TAG CONFIG: RC
diff --git a/package/palantir/Makefile b/package/palantir/Makefile
deleted file mode 100644
index 5deb3c83f..000000000
--- a/package/palantir/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include ${TOPDIR}/rules.mk
-
-PKG_NAME:=		palantir
-PKG_VERSION:=		2.7
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		3a5b1fb340857f6d8e357bf39b77583e
-PKG_DESCR:=		A multichannel interactive streaming solution
-PKG_SECTION:=		multimedia
-PKG_DEPENDS:=		libjpeg libpthread
-PKG_BUILDDEP:=		jpeg
-PKG_URL:=		http://www.fastpath.it/products/palantir/
-PKG_SITES:=		http://www.fastpath.it/products/palantir/pub/
-
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tgz
-
-include ${TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,PALANTIR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIG_STYLE:=          manual
-BUILD_STYLE:=           manual
-INSTALL_STYLE:=         manual
-
-TARGET_CFLAGS+=		-Wall
-TARGET_CPPFLAGS+=	-D_REENTRANT
-
-do-build:
-	mkdir -p ${WRKINST}/usr
-	${MAKE} -C ${WRKBUILD}/server/libgsm \
-		${TARGET_CONFIGURE_OPTS} \
-		CCINC="${TARGET_CPPFLAGS}" \
-		lib/libgsm.a
-	${MAKE} -C ${WRKBUILD}/server \
-		${TARGET_CONFIGURE_OPTS} \
-		palantir
-
-do-install:
-	${INSTALL_DIR} ${IDIR_PALANTIR}/etc
-	${INSTALL_DIR} ${IDIR_PALANTIR}/usr/sbin
-	${INSTALL_DATA} ${WRKBUILD}/server/palantir-mips.conf.sample \
-	                ${IDIR_PALANTIR}/etc/palantir.conf
-	${INSTALL_BIN} ${WRKBUILD}/server/palantir ${IDIR_PALANTIR}/usr/sbin/
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/palantir/files/palantir.conffiles b/package/palantir/files/palantir.conffiles
deleted file mode 100644
index a57f0c6fd..000000000
--- a/package/palantir/files/palantir.conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/palantir.conf
diff --git a/package/palantir/patches/patch-server_Makefile b/package/palantir/patches/patch-server_Makefile
deleted file mode 100644
index a9bc81951..000000000
--- a/package/palantir/patches/patch-server_Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
---- palantir-2.7.orig/server/Makefile	2007-05-19 01:31:36.000000000 +0200
-+++ palantir-2.7/server/Makefile	2011-01-20 15:24:19.478658283 +0100
-@@ -47,10 +47,11 @@ ENABLE_X11MON=	0
- .PHONY : tools man
- 
- 
--CFLAGS= -Wall -D_REENTRANT -O2 -g
-+CFLAGS?= -Wall -D_REENTRANT -O2 -g
- # -O3
--CC= gcc
--libjpeg= -ljpeg
-+CC?= gcc
-+LIBS?=
-+LIBS+= -ljpeg -lpthread
- 
- ifeq ($(TARGET),mips)
- 	BROADCOM_SRC= /usr/local/broadcom/src
-@@ -86,7 +87,7 @@ SRCS= *.c
- libgsm= libgsm/lib/libgsm.a
- 
- palantir: $(libgsm) $(OBJ) tools man
--	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) $(libgsm) $(libjpeg) -lpthread -o palantir
-+	$(CC) $(LDFLAGS) $(OBJ) $(libgsm) $(LIBS) -o palantir
- 
- mips:
- 	make TARGET=mips palantir
diff --git a/package/palantir/patches/patch-server_libgsm_Makefile b/package/palantir/patches/patch-server_libgsm_Makefile
deleted file mode 100644
index 079e9a825..000000000
--- a/package/palantir/patches/patch-server_libgsm_Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
---- palantir-2.7.orig/server/libgsm/Makefile	2007-03-31 11:50:49.000000000 +0200
-+++ palantir-2.7/server/libgsm/Makefile	2011-01-20 15:22:46.318658281 +0100
-@@ -49,11 +49,11 @@ WAV49	= -DWAV49
- # CCFLAGS 	= -c -O
- 
- ifndef CC
--CC		= gcc
-+CC		?= gcc
- endif
- 
--CC		+= -ansi -pedantic
--CCFLAGS 	= -c -O2 -DNeedFunctionPrototypes=1
-+CFLAGS		+= -ansi -pedantic
-+CPPFLAGS 	?= -DNeedFunctionPrototypes=1
- 
- LD 		= $(CC)
- 
-@@ -80,7 +80,7 @@ SHELL		= /bin/sh
- LN		= ln
- BASENAME 	= basename
- ifndef AR
--AR		= ar
-+AR		?= ar
- endif
- ARFLAGS		= cr
- RMFLAGS		=
-@@ -89,7 +89,7 @@ COMPRESS 	= compress
- COMPRESSFLAGS 	= 
- # RANLIB 	= true
- ifndef RANLIB
--RANLIB	 	= ranlib
-+RANLIB	 	?= ranlib
- endif
- 
- #
-@@ -109,7 +109,7 @@ INC	= $(ROOT)/inc
- # DEBUG	= -DNDEBUG
- ######### Remove -DNDEBUG to enable assertions.
- 
--CFLAGS	= $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \
-+CFLAGS	+= $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \
- 	$(WAV49) $(CCINC) -I$(INC)
- ######### It's $(CC) $(CFLAGS)
- 
-@@ -177,7 +177,7 @@ GSM_OBJECTS =	$(SRC)/add.o		\
- # Default rules
- 
- .c.o:
--		$(CC) $(CFLAGS) $?
-+		$(CC) $(CPPFLAGS) $(CFLAGS) -c $?
- 		@-mv `$(BASENAME) $@` $@ > /dev/null 2>&1
- 
- # Target rules
diff --git a/package/setpwc/Makefile b/package/setpwc/Makefile
index 80d398a31..18ef41482 100644
--- a/package/setpwc/Makefile
+++ b/package/setpwc/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		setpwc
-PKG_VERSION:=		1.2
+PKG_VERSION:=		1.3
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		1bc721cdfcbac24027e2afc93685d29f
+PKG_MD5SUM:=		79d5ee468c0076feb3cac473bef661d2
 PKG_DESCR:=		Philips (and compatibles) WebCams (PWC) control utility
 PKG_SECTION:=		multimedia
 PKG_URL:=		http://www.vanheusden.com/setpwc/
diff --git a/package/udev/Makefile b/package/udev/Makefile
index 152e8b7f9..75d04b791 100644
--- a/package/udev/Makefile
+++ b/package/udev/Makefile
@@ -4,11 +4,12 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		udev
-PKG_VERSION:=		151
+PKG_VERSION:=		171
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		aeae0e6273dcbec246c3c1b9868ebed1
+PKG_MD5SUM:=		bdf4617284be2ecac11767437417e209
 PKG_DESCR:=		Dynamic device management subsystem
 PKG_SECTION:=		utils
+PKG_BUILDDEP:=		usbutils
 PKG_URL:=		http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
 PKG_SITES:=		${MASTER_SITE_KERNEL:=utils/kernel/hotplug/}
 
@@ -22,6 +23,8 @@ $(eval $(call PKG_template,UDEV,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_
 
 CONFIGURE_ARGS+=	--disable-extras \
 			--disable-logging \
+			--disable-udev_acl \
+			--with-pci-ids-path=/usr/share/pci.ids \
 			--disable-introspection
 
 post-install:
diff --git a/package/udev/patches/patch-Makefile_in b/package/udev/patches/patch-Makefile_in
deleted file mode 100644
index 1f49ed49b..000000000
--- a/package/udev/patches/patch-Makefile_in
+++ /dev/null
@@ -1,118 +0,0 @@
---- udev-151.orig/Makefile.in	2010-01-27 09:34:59.000000000 +0100
-+++ udev-151/Makefile.in	2010-03-17 22:14:17.343159812 +0100
-@@ -48,7 +48,6 @@ sbin_PROGRAMS = udev/udevd$(EXEEXT) udev
- check_PROGRAMS = libudev/test-libudev$(EXEEXT) udev/test-udev$(EXEEXT)
- libexec_PROGRAMS = extras/firmware/firmware$(EXEEXT) \
- 	extras/ata_id/ata_id$(EXEEXT) \
--	extras/cdrom_id/cdrom_id$(EXEEXT) \
- 	extras/collect/collect$(EXEEXT) extras/edd_id/edd_id$(EXEEXT) \
- 	extras/floppy/create_floppy_devices$(EXEEXT) \
- 	extras/input_id/input_id$(EXEEXT) \
-@@ -221,11 +220,6 @@ PROGRAMS = $(libexec_PROGRAMS) $(sbin_PR
- am_extras_ata_id_ata_id_OBJECTS = extras/ata_id/ata_id.$(OBJEXT)
- extras_ata_id_ata_id_OBJECTS = $(am_extras_ata_id_ata_id_OBJECTS)
- extras_ata_id_ata_id_DEPENDENCIES = libudev/libudev-private.la
--am_extras_cdrom_id_cdrom_id_OBJECTS =  \
--	extras/cdrom_id/cdrom_id.$(OBJEXT)
--extras_cdrom_id_cdrom_id_OBJECTS =  \
--	$(am_extras_cdrom_id_cdrom_id_OBJECTS)
--extras_cdrom_id_cdrom_id_DEPENDENCIES = libudev/libudev-private.la
- am_extras_collect_collect_OBJECTS = extras/collect/collect.$(OBJEXT)
- extras_collect_collect_OBJECTS = $(am_extras_collect_collect_OBJECTS)
- extras_collect_collect_DEPENDENCIES = libudev/libudev-private.la
-@@ -366,7 +360,6 @@ SOURCES = $(extras_gudev_libgudev_1_0_la
- 	$(dist_extras_gudev_libgudev_1_0_la_SOURCES) \
- 	$(libudev_libudev_private_la_SOURCES) \
- 	$(libudev_libudev_la_SOURCES) $(extras_ata_id_ata_id_SOURCES) \
--	$(extras_cdrom_id_cdrom_id_SOURCES) \
- 	$(extras_collect_collect_SOURCES) \
- 	$(extras_edd_id_edd_id_SOURCES) \
- 	$(extras_firmware_firmware_SOURCES) \
-@@ -390,7 +383,6 @@ DIST_SOURCES = $(am__extras_gudev_libgud
- 	$(am__dist_extras_gudev_libgudev_1_0_la_SOURCES_DIST) \
- 	$(am__libudev_libudev_private_la_SOURCES_DIST) \
- 	$(libudev_libudev_la_SOURCES) $(extras_ata_id_ata_id_SOURCES) \
--	$(extras_cdrom_id_cdrom_id_SOURCES) \
- 	$(extras_collect_collect_SOURCES) \
- 	$(extras_edd_id_edd_id_SOURCES) \
- 	$(extras_firmware_firmware_SOURCES) \
-@@ -477,7 +469,6 @@ am__dist_udevrules_DATA_DIST = rules/rul
- 	extras/rule_generator/75-cd-aliases-generator.rules \
- 	extras/rule_generator/75-persistent-net-generator.rules \
- 	extras/firmware/50-firmware.rules \
--	extras/cdrom_id/60-cdrom_id.rules \
- 	extras/edd_id/61-persistent-storage-edd.rules \
- 	extras/floppy/60-floppy.rules \
- 	extras/fstab_import/79-fstab_import.rules \
-@@ -748,7 +739,6 @@ dist_udevrules_DATA = rules/rules.d/50-u
- 	extras/rule_generator/75-cd-aliases-generator.rules \
- 	extras/rule_generator/75-persistent-net-generator.rules \
- 	extras/firmware/50-firmware.rules \
--	extras/cdrom_id/60-cdrom_id.rules \
- 	extras/edd_id/61-persistent-storage-edd.rules \
- 	extras/floppy/60-floppy.rules \
- 	extras/fstab_import/79-fstab_import.rules \
-@@ -820,12 +810,6 @@ extras_ata_id_ata_id_SOURCES = extras/at
- extras_ata_id_ata_id_LDADD = libudev/libudev-private.la
- 
- # ------------------------------------------------------------------------------
--# cdrom_id - optical drive/media capability
--# ------------------------------------------------------------------------------
--extras_cdrom_id_cdrom_id_SOURCES = extras/cdrom_id/cdrom_id.c
--extras_cdrom_id_cdrom_id_LDADD = libudev/libudev-private.la
--
--# ------------------------------------------------------------------------------
- # collect - trigger action when a collection of devices appeared
- # ------------------------------------------------------------------------------
- extras_collect_collect_SOURCES = extras/collect/collect.c
-@@ -1314,17 +1298,6 @@ extras/ata_id/ata_id.$(OBJEXT): extras/a
- extras/ata_id/ata_id$(EXEEXT): $(extras_ata_id_ata_id_OBJECTS) $(extras_ata_id_ata_id_DEPENDENCIES) extras/ata_id/$(am__dirstamp)
- 	@rm -f extras/ata_id/ata_id$(EXEEXT)
- 	$(AM_V_CCLD)$(LINK) $(extras_ata_id_ata_id_OBJECTS) $(extras_ata_id_ata_id_LDADD) $(LIBS)
--extras/cdrom_id/$(am__dirstamp):
--	@$(MKDIR_P) extras/cdrom_id
--	@: > extras/cdrom_id/$(am__dirstamp)
--extras/cdrom_id/$(DEPDIR)/$(am__dirstamp):
--	@$(MKDIR_P) extras/cdrom_id/$(DEPDIR)
--	@: > extras/cdrom_id/$(DEPDIR)/$(am__dirstamp)
--extras/cdrom_id/cdrom_id.$(OBJEXT): extras/cdrom_id/$(am__dirstamp) \
--	extras/cdrom_id/$(DEPDIR)/$(am__dirstamp)
--extras/cdrom_id/cdrom_id$(EXEEXT): $(extras_cdrom_id_cdrom_id_OBJECTS) $(extras_cdrom_id_cdrom_id_DEPENDENCIES) extras/cdrom_id/$(am__dirstamp)
--	@rm -f extras/cdrom_id/cdrom_id$(EXEEXT)
--	$(AM_V_CCLD)$(LINK) $(extras_cdrom_id_cdrom_id_OBJECTS) $(extras_cdrom_id_cdrom_id_LDADD) $(LIBS)
- extras/collect/$(am__dirstamp):
- 	@$(MKDIR_P) extras/collect
- 	@: > extras/collect/$(am__dirstamp)
-@@ -1598,7 +1571,6 @@ uninstall-dist_libexecSCRIPTS:
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
- 	-rm -f extras/ata_id/ata_id.$(OBJEXT)
--	-rm -f extras/cdrom_id/cdrom_id.$(OBJEXT)
- 	-rm -f extras/collect/collect.$(OBJEXT)
- 	-rm -f extras/edd_id/edd_id.$(OBJEXT)
- 	-rm -f extras/firmware/firmware.$(OBJEXT)
-@@ -1670,7 +1642,6 @@ distclean-compile:
- 	-rm -f *.tab.c
- 
- @AMDEP_TRUE@@am__include@ @am__quote@extras/ata_id/$(DEPDIR)/ata_id.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@extras/cdrom_id/$(DEPDIR)/cdrom_id.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@extras/collect/$(DEPDIR)/collect.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@extras/edd_id/$(DEPDIR)/edd_id.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@extras/firmware/$(DEPDIR)/firmware.Po@am__quote@
-@@ -1931,7 +1902,6 @@ mostlyclean-libtool:
- clean-libtool:
- 	-rm -rf .libs _libs
- 	-rm -rf extras/ata_id/.libs extras/ata_id/_libs
--	-rm -rf extras/cdrom_id/.libs extras/cdrom_id/_libs
- 	-rm -rf extras/collect/.libs extras/collect/_libs
- 	-rm -rf extras/edd_id/.libs extras/edd_id/_libs
- 	-rm -rf extras/firmware/.libs extras/firmware/_libs
-@@ -2729,8 +2699,6 @@ distclean-generic:
- 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
- 	-rm -f extras/ata_id/$(DEPDIR)/$(am__dirstamp)
- 	-rm -f extras/ata_id/$(am__dirstamp)
--	-rm -f extras/cdrom_id/$(DEPDIR)/$(am__dirstamp)
--	-rm -f extras/cdrom_id/$(am__dirstamp)
- 	-rm -f extras/collect/$(DEPDIR)/$(am__dirstamp)
- 	-rm -f extras/collect/$(am__dirstamp)
- 	-rm -f extras/edd_id/$(DEPDIR)/$(am__dirstamp)
diff --git a/package/udev/patches/patch-extras_cdrom_id_cdrom_id_c b/package/udev/patches/patch-extras_cdrom_id_cdrom_id_c
deleted file mode 100644
index 61c499cd2..000000000
--- a/package/udev/patches/patch-extras_cdrom_id_cdrom_id_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- udev-151.orig/extras/cdrom_id/cdrom_id.c	2009-12-03 13:45:03.000000000 +0100
-+++ udev-151/extras/cdrom_id/cdrom_id.c	2010-03-17 22:10:24.984418969 +0100
-@@ -141,7 +141,7 @@ static void scsi_cmd_set(struct udev *ud
- 		cmd->sg_io.mx_sb_len = sizeof(cmd->_sense);
- 		cmd->sg_io.cmdp = cmd->cgc.cmd;
- 		cmd->sg_io.sbp = cmd->_sense.u;
--		cmd->sg_io.flags = SG_FLAG_LUN_INHIBIT | SG_FLAG_DIRECT_IO;
-+		cmd->sg_io.flags = SG_FLAG_UNUSED_LUN_INHIBIT | SG_FLAG_DIRECT_IO;
- 	}
- 	cmd->sg_io.cmd_len = i + 1;
- 	cmd->cgc.cmd[i] = arg;
diff --git a/package/usbutils/Makefile b/package/usbutils/Makefile
index 2aae6b570..31c2b6980 100644
--- a/package/usbutils/Makefile
+++ b/package/usbutils/Makefile
@@ -4,14 +4,14 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		usbutils
-PKG_VERSION:=		0.86
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		34979f675d2bcb3e1b45012fa830a53f
+PKG_VERSION:=		003
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		94a1738fe92062cdd6a9642eeaccefc1
 PKG_DESCR:=		A program to list USB devices
 PKG_SECTION:=		utils
 PKG_DEPENDS:=		libusb libusb-compat libpthread
 PKG_BUILDDEP:=		libusb libusb-compat
-PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=linux-usb/}
+PKG_SITES:=		http://www.kernel.org/pub/linux/utils/usb/usbutils/
 
 PKG_SUBPKGS:=		LSUSB
 
@@ -21,9 +21,9 @@ $(eval $(call PKG_template,LSUSB,lsusb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LSUSB}/usr/share
-	${INSTALL_DATA} ${WRKINST}/usr/share/usb.ids \
+	${INSTALL_DATA} ${WRKINST}/usr/share/usb.ids.gz \
 		${IDIR_LSUSB}/usr/share/
 	${INSTALL_DIR} ${IDIR_LSUSB}/usr/bin
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/lsusb ${IDIR_LSUSB}/usr/bin
+	${INSTALL_BIN} ${WRKINST}/usr/bin/lsusb ${IDIR_LSUSB}/usr/bin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/usbutils/patches/patch-Makefile_in b/package/usbutils/patches/patch-Makefile_in
new file mode 100644
index 000000000..2e0372fc9
--- /dev/null
+++ b/package/usbutils/patches/patch-Makefile_in
@@ -0,0 +1,11 @@
+--- usbutils-003.orig/Makefile.in	2011-06-16 02:37:51.000000000 +0200
++++ usbutils-003/Makefile.in	2011-06-16 17:45:11.596951462 +0200
+@@ -298,7 +298,7 @@ EXTRA_DIST = \
+ 	lsusb.py \
+ 	usbutils.pc.in
+ 
+-pkgconfigdir = $(datarootdir)/pkgconfig
++pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = usbutils.pc
+ DISTCLEANFILES = \
+ 	usb.ids.gz \
diff --git a/target/linux/config/Config.in.bluetooth b/target/linux/config/Config.in.bluetooth
index 0d4d6f7af..26ac067b1 100644
--- a/target/linux/config/Config.in.bluetooth
+++ b/target/linux/config/Config.in.bluetooth
@@ -2,7 +2,7 @@ menu "Bluetooth"
 depends on ADK_TARGET_WITH_USB || ADK_TARGET_WITH_MINIPCI
 
 config ADK_KPACKAGE_KMOD_BT
-	prompt "kmod-bluetooth.................... Bluetooth drivers and network stack"
+	prompt "kmod-bt.................... Bluetooth drivers and network stack"
 	tristate
 	default n
 	help
@@ -22,9 +22,9 @@ config ADK_KPACKAGE_KMOD_BT
 	     CMTP Module (CAPI Message Transport Protocol)
 	     HIDP Module (Human Interface Device Protocol)
 
-config ADK_KPACKAGE_KMOD_BT_L2CAP
-	prompt "kmod-bluetooth-l2cap.............. L2CAP protocol support"
-	tristate
+config ADK_KERNEL_BT_L2CAP
+	prompt "........................... L2CAP protocol support"
+	boolean
 	default n
 	depends on ADK_KPACKAGE_KMOD_BT
 	help
@@ -33,9 +33,9 @@ config ADK_KPACKAGE_KMOD_BT_L2CAP
 	  support is required for most Bluetooth applications.
 
 
-config ADK_KPACKAGE_KMOD_BT_SCO
-	prompt "kmod-bluetooth-sco................ SCO links support"
-	tristate
+config ADK_KERNEL_BT_SCO
+	prompt "........................... SCO links support"
+	boolean
 	default n
 	depends on ADK_KPACKAGE_KMOD_BT
 	help
@@ -43,7 +43,7 @@ config ADK_KPACKAGE_KMOD_BT_SCO
 	  required for voice applications like Headset and Audio.
 
 config ADK_KPACKAGE_KMOD_BT_RFCOMM
-	prompt "kmod-bluetooth-rfcomm............. RFCOMM protocol support"
+	prompt "kmod-bt-rfcomm............. RFCOMM protocol support"
 	tristate
 	default n
 	depends on ADK_KPACKAGE_KMOD_BT
@@ -54,7 +54,7 @@ config ADK_KPACKAGE_KMOD_BT_RFCOMM
 	  applications.
 
 config ADK_KPACKAGE_KMOD_BT_BNEP
-	prompt "kmod-bluetooth-bnep............... BNEP protocol support"
+	prompt "kmod-bt-bnep............... BNEP protocol support"
 	tristate
 	default n
 	depends on ADK_KPACKAGE_KMOD_BT
@@ -65,7 +65,7 @@ config ADK_KPACKAGE_KMOD_BT_BNEP
 	  Bluetooth PAN (Personal Area Network).
 
 config ADK_KPACKAGE_KMOD_BT_HIDP
-	prompt "kmod-bluetooth-hidp............... HIDP protocol support"
+	prompt "kmod-bt-hidp............... HIDP protocol support"
 	tristate
 	default n
 	select ADK_KERNEL_INPUT
@@ -78,7 +78,7 @@ config ADK_KPACKAGE_KMOD_BT_HIDP
 	  Interface Device Profile.
 
 config ADK_KPACKAGE_KMOD_BT_HCIBTUSB
-	prompt "kmod-bluetooth-hci-usb............ HCI USB driver"
+	prompt "kmod-bt-hci-usb............ HCI USB driver"
 	tristate
 	default n
 	depends on ADK_KPACKAGE_KMOD_BT
@@ -88,7 +88,7 @@ config ADK_KPACKAGE_KMOD_BT_HCIBTUSB
 	  USB interface.
 
 config ADK_KPACKAGE_KMOD_BT_HCIUART
-	prompt "kmod-bluetooth-hci-uart........... HCI UART driver"
+	prompt "kmod-bt-hci-uart........... HCI UART driver"
 	tristate
 	default n
 	depends on ADK_KPACKAGE_KMOD_BT
@@ -100,7 +100,7 @@ config ADK_KPACKAGE_KMOD_BT_HCIUART
 	  adapter and BrainBoxes Bluetooth PC Card.
 
 config ADK_KPACKAGE_KMOD_BT_HCIBCM203X
-	prompt "kmod-bluetooth-hci-bcm203x........ HCI BCM203x USB driver"
+	prompt "kmod-bt-hci-bcm203x........ HCI BCM203x USB driver"
 	tristate
 	default n
 	select ADK_KPACKAGE_KMOD_FW_LOADER
@@ -112,7 +112,7 @@ config ADK_KPACKAGE_KMOD_BT_HCIBCM203X
 	  Blutonium based devices.
 
 config ADK_KPACKAGE_KMOD_BT_HCIBPA10X
-	prompt "kmod-bluetooth-hci-bpa10x......... HCI BPA10x USB driver"
+	prompt "kmod-bt-hci-bpa10x......... HCI BPA10x USB driver"
 	tristate
 	default n
 	depends on ADK_KPACKAGE_KMOD_BT