add LTO support to toolchain settings. Cleanup SYSROOT mess.

- just use on sysroot directory for toolchain.
- add missing patches from previos commit. (rpath/cflags cleanup)

16 files changed, 275 insertions, 36 deletions

diff --git a/package/ImageMagick/patches/patch-config_ltmain_sh b/package/ImageMagick/patches/patch-config_ltmain_sh
new file mode 100644
index 000000000..3c1be111b
--- /dev/null
+++ b/package/ImageMagick/patches/patch-config_ltmain_sh
@@ -0,0 +1,30 @@
+--- ImageMagick-6.6.5-10.orig/config/ltmain.sh	2010-11-21 22:35:22.000000000 +0100
++++ ImageMagick-6.6.5-10/config/ltmain.sh	2011-01-08 23:20:33.000000000 +0100
+@@ -5843,27 +5843,6 @@ func_mode_link ()
+ 	      esac
+ 	    fi
+ 
+-	    # Hardcode the library path.
+-	    # Skip directories that are in the system default run-time
+-	    # search path.
+-	    case " $sys_lib_dlsearch_path " in
+-	    *" $absdir "*) ;;
+-	    *)
+-	      case "$compile_rpath " in
+-	      *" $absdir "*) ;;
+-	      *) compile_rpath="$compile_rpath $absdir"
+-	      esac
+-	      ;;
+-	    esac
+-	    case " $sys_lib_dlsearch_path " in
+-	    *" $libdir "*) ;;
+-	    *)
+-	      case "$finalize_rpath " in
+-	      *" $libdir "*) ;;
+-	      *) finalize_rpath="$finalize_rpath $libdir"
+-	      esac
+-	      ;;
+-	    esac
+ 	  fi # $linkmode,$pass = prog,link...
+ 
+ 	  if test "$alldeplibs" = yes &&
diff --git a/package/ImageMagick/patches/patch-configure b/package/ImageMagick/patches/patch-configure
deleted file mode 100644
index 717f612ea..000000000
--- a/package/ImageMagick/patches/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- ImageMagick-6.6.5-10.orig/configure	2010-11-21 22:36:46.000000000 +0100
-+++ ImageMagick-6.6.5-10/configure	2011-01-07 00:03:54.000000000 +0100
-@@ -14824,7 +14824,7 @@ fi
-   # This implies no fast_install, which is unacceptable.
-   # Some rework will be needed to allow for fast_install
-   # before this can be enabled.
--  hardcode_into_libs=yes
-+  hardcode_into_libs=no
- 
-   # Add ABI-specific directories to the system library path.
-   sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-@@ -18491,7 +18491,7 @@ fi
-   # This implies no fast_install, which is unacceptable.
-   # Some rework will be needed to allow for fast_install
-   # before this can be enabled.
--  hardcode_into_libs=yes
-+  hardcode_into_libs=no
- 
-   # Add ABI-specific directories to the system library path.
-   sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
diff --git a/package/dbus/patches/patch-configure b/package/dbus/patches/patch-configure
index f33a192a9..85521d390 100644
--- a/package/dbus/patches/patch-configure
+++ b/package/dbus/patches/patch-configure
@@ -1,6 +1,6 @@
---- dbus-1.2.16.orig/configure	2009-07-14 21:43:08.000000000 +0200
-+++ dbus-1.2.16/configure	2010-01-15 19:03:24.000000000 +0100
-@@ -25213,19 +25213,6 @@ if test "x$GCC" = "xyes"; then
+--- dbus-1.2.24.orig/configure	2010-03-23 20:11:22.000000000 +0100
++++ dbus-1.2.24/configure	2011-01-08 22:50:31.000000000 +0100
+@@ -25294,19 +25296,6 @@ if test "x$GCC" = "xyes"; then
       ;;
    esac
  
diff --git a/package/dbus/patches/patch-ltmain_sh b/package/dbus/patches/patch-ltmain_sh
new file mode 100644
index 000000000..b63e1d647
--- /dev/null
+++ b/package/dbus/patches/patch-ltmain_sh
@@ -0,0 +1,30 @@
+--- dbus-1.2.24.orig/ltmain.sh	2010-03-12 23:22:29.000000000 +0100
++++ dbus-1.2.24/ltmain.sh	2011-01-08 22:57:14.000000000 +0100
+@@ -5516,27 +5516,6 @@ func_mode_link ()
+ 	      esac
+ 	    fi
+ 
+-	    # Hardcode the library path.
+-	    # Skip directories that are in the system default run-time
+-	    # search path.
+-	    case " $sys_lib_dlsearch_path " in
+-	    *" $absdir "*) ;;
+-	    *)
+-	      case "$compile_rpath " in
+-	      *" $absdir "*) ;;
+-	      *) compile_rpath="$compile_rpath $absdir"
+-	      esac
+-	      ;;
+-	    esac
+-	    case " $sys_lib_dlsearch_path " in
+-	    *" $libdir "*) ;;
+-	    *)
+-	      case "$finalize_rpath " in
+-	      *" $libdir "*) ;;
+-	      *) finalize_rpath="$finalize_rpath $libdir"
+-	      esac
+-	      ;;
+-	    esac
+ 	  fi # $linkmode,$pass = prog,link...
+ 
+ 	  if test "$alldeplibs" = yes &&
diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile
index e82e3b707..844b49876 100644
--- a/package/eglibc/Makefile
+++ b/package/eglibc/Makefile
@@ -20,10 +20,9 @@ CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
-EGLIBC_CONFOPTS:=	\
-			--build=$(GNU_HOST_NAME) \
+EGLIBC_CONFOPTS:=	--build=$(GNU_HOST_NAME) \
 			--host=$(REAL_GNU_TARGET_NAME) \
-			--with-headers=$(TOOLCHAIN_SYSROOT)/usr/include \
+			--with-headers=$(STAGING_TARGET_DIR)/usr/include \
 			--disable-nls \
 			--without-cvs \
 			--disable-profile \
diff --git a/package/fltk/patches/patch-fltk2-config_in b/package/fltk/patches/patch-fltk2-config_in
new file mode 100644
index 000000000..c4784688a
--- /dev/null
+++ b/package/fltk/patches/patch-fltk2-config_in
@@ -0,0 +1,27 @@
+--- fltk-2.0.x-r7513.orig/fltk2-config.in	2006-04-15 19:43:12.000000000 +0200
++++ fltk-2.0.x-r7513/fltk2-config.in	2011-01-08 23:34:40.000000000 +0100
+@@ -77,7 +77,6 @@ LDLIBS="@LDFLAGS@ @LIBS@"
+ # libraries to link with:
+ LIBNAME="@LIBNAME@"
+ DSONAME="@DSONAME@"
+-DSOLINK="@DSOLINK@"
+ IMAGELIBS="@IMAGELIBS@"
+ SHAREDSUFFIX="@SHAREDSUFFIX@"
+ 
+@@ -168,7 +167,6 @@ do
+       bindir=${exec_prefix}
+       includedir=${prefix}/include
+       libdir=${prefix}/lib
+-      DSOLINK="-Wl,-rpath,${prefix}/lib"
+ 	    ;;
+ 	--prefix)
+ 	    echo_prefix=yes
+@@ -283,7 +281,7 @@ if test x$use_images = xyes; then
+     LDSTATIC="$libdir/libfltk2_images.a $LDSTATIC $IMAGELIBS"
+ fi
+ 
+-LDLIBS="$DSOLINK $LDLIBS"
++LDLIBS="$LDLIBS"
+ LDSTATIC="$LDSTATIC_PATHS $LDSTATIC"
+ 
+ # Answer to user requests
diff --git a/package/gettext/Makefile b/package/gettext/Makefile
index 76e73fed0..76d47acd5 100644
--- a/package/gettext/Makefile
+++ b/package/gettext/Makefile
@@ -18,7 +18,7 @@ ifeq ($(ADK_STATIC),y)
 PKG_OPTS:=		libonly
 endif
 
-WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}/gettext-runtime
+WRKSRC=			${WRKDIR}/${PKG_NAME}-${PKG_VERSION}/gettext-runtime
 
 include ${TOPDIR}/mk/package.mk
 
@@ -29,6 +29,7 @@ CONFIGURE_ARGS+=	--disable-java \
 			--disable-csharp \
 			--enable-nls \
 			--disable-libasprintf \
+			--disable-rpath \
 			--enable-threads=posix \
 			--disable-openmp \
 			--with-libiconv-prefix='${STAGING_TARGET_DIR}/usr' \
diff --git a/package/gettext/patches/patch-build-aux_ltmain_sh b/package/gettext/patches/patch-build-aux_ltmain_sh
new file mode 100644
index 000000000..9141bd704
--- /dev/null
+++ b/package/gettext/patches/patch-build-aux_ltmain_sh
@@ -0,0 +1,30 @@
+--- gettext-0.18.1.1.orig/build-aux/ltmain.sh	2010-06-06 14:49:57.000000000 +0200
++++ gettext-0.18.1.1/build-aux/ltmain.sh	2011-01-08 23:49:55.000000000 +0100
+@@ -5652,27 +5652,6 @@ func_mode_link ()
+ 	      esac
+ 	    fi
+ 
+-	    # Hardcode the library path.
+-	    # Skip directories that are in the system default run-time
+-	    # search path.
+-	    case " $sys_lib_dlsearch_path " in
+-	    *" $absdir "*) ;;
+-	    *)
+-	      case "$compile_rpath " in
+-	      *" $absdir "*) ;;
+-	      *) compile_rpath="$compile_rpath $absdir"
+-	      esac
+-	      ;;
+-	    esac
+-	    case " $sys_lib_dlsearch_path " in
+-	    *" $libdir "*) ;;
+-	    *)
+-	      case "$finalize_rpath " in
+-	      *" $libdir "*) ;;
+-	      *) finalize_rpath="$finalize_rpath $libdir"
+-	      esac
+-	      ;;
+-	    esac
+ 	  fi # $linkmode,$pass = prog,link...
+ 
+ 	  if test "$alldeplibs" = yes &&
diff --git a/package/gnupg/Makefile b/package/gnupg/Makefile
index ff3739775..d28b2b4dc 100644
--- a/package/gnupg/Makefile
+++ b/package/gnupg/Makefile
@@ -29,6 +29,7 @@ CONFIGURE_ARGS+=	--disable-asm \
 			--disable-finger \
 			--disable-ftp \
 			--disable-dns-srv \
+			--disable-rpath \
 			--enable-fake-curl \
 			--disable-regex
 
diff --git a/package/irssi/patches/patch-build-aux_ltmain_sh b/package/irssi/patches/patch-build-aux_ltmain_sh
new file mode 100644
index 000000000..05bcb0e77
--- /dev/null
+++ b/package/irssi/patches/patch-build-aux_ltmain_sh
@@ -0,0 +1,30 @@
+--- irssi-0.8.15.orig/build-aux/ltmain.sh	2010-04-03 18:21:23.000000000 +0200
++++ irssi-0.8.15/build-aux/ltmain.sh	2011-01-09 00:18:54.000000000 +0100
+@@ -5516,27 +5516,6 @@ func_mode_link ()
+ 	      esac
+ 	    fi
+ 
+-	    # Hardcode the library path.
+-	    # Skip directories that are in the system default run-time
+-	    # search path.
+-	    case " $sys_lib_dlsearch_path " in
+-	    *" $absdir "*) ;;
+-	    *)
+-	      case "$compile_rpath " in
+-	      *" $absdir "*) ;;
+-	      *) compile_rpath="$compile_rpath $absdir"
+-	      esac
+-	      ;;
+-	    esac
+-	    case " $sys_lib_dlsearch_path " in
+-	    *" $libdir "*) ;;
+-	    *)
+-	      case "$finalize_rpath " in
+-	      *" $libdir "*) ;;
+-	      *) finalize_rpath="$finalize_rpath $libdir"
+-	      esac
+-	      ;;
+-	    esac
+ 	  fi # $linkmode,$pass = prog,link...
+ 
+ 	  if test "$alldeplibs" = yes &&
diff --git a/package/krb5/patches/patch-src_krb5-config_in b/package/krb5/patches/patch-src_krb5-config_in
new file mode 100644
index 000000000..ddc0159a6
--- /dev/null
+++ b/package/krb5/patches/patch-src_krb5-config_in
@@ -0,0 +1,22 @@
+--- krb5-1.8.1.orig/src/krb5-config.in	2010-01-21 23:49:01.000000000 +0100
++++ krb5-1.8.1/src/krb5-config.in	2011-01-09 01:33:14.000000000 +0100
+@@ -34,8 +34,6 @@ libdir=@libdir@
+ CC_LINK='@CC_LINK@'
+ KDB5_DB_LIB=@KDB5_DB_LIB@
+ LDFLAGS='@LDFLAGS@'
+-RPATH_FLAG='@RPATH_FLAG@'
+-PROG_RPATH_FLAGS='@PROG_RPATH_FLAGS@'
+ PTHREAD_CFLAGS='@PTHREAD_CFLAGS@'
+ DL_LIB='@DL_LIB@'
+ 
+@@ -180,10 +178,7 @@ if test -n "$do_libs"; then
+     # Ugly gross hack for our build tree
+     lib_flags=`echo $CC_LINK | sed -e 's/\$(CC)//' \
+ 	    -e 's/\$(PURE)//' \
+-	    -e 's#\$(PROG_RPATH_FLAGS)#'"$PROG_RPATH_FLAGS"'#' \
+-	    -e 's#\$(PROG_RPATH)#'$libdir'#' \
+ 	    -e 's#\$(PROG_LIBPATH)#'$libdirarg'#' \
+-	    -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \
+ 	    -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \
+ 	    -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
+ 	    -e 's#\$(CFLAGS)#'"$CFLAGS"'#'`
diff --git a/package/libelf/Makefile b/package/libelf/Makefile
index a5847bc87..c8ae86b32 100644
--- a/package/libelf/Makefile
+++ b/package/libelf/Makefile
@@ -2,18 +2,17 @@
 # material, please see the LICENCE file in the top-level directory.
 
 include ${TOPDIR}/rules.mk
+include ${TOPDIR}/toolchain/libelf/Makefile.inc
 
-PKG_NAME:=		libelf
-PKG_VERSION:=		0.8.11
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		e931910b6d100f6caa32239849947fbf
 PKG_DESCR:=		elf library
 PKG_SECTION:=		libs
 PKG_SITES:=		http://www.mr511.de/software/
 
+PKG_SUBPKGS:=		LIBELF
+
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBELF,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBELF,libelf,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ENV+=		mr_cv_target_elf=yes \
 			ac_cv_sizeof_long_long=8
@@ -21,7 +20,7 @@ CONFIGURE_ARGS+=	--enable-elf64=yes \
 			--disable-sanity-checks
 FAKE_FLAGS+=		instroot="${WRKINST}"
 
-post-install:
+libelf-install:
 	${INSTALL_DIR} ${IDIR_LIBELF}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libelf.so* ${IDIR_LIBELF}/usr/lib/
 
diff --git a/package/opensc/patches/patch-ltmain_sh b/package/opensc/patches/patch-ltmain_sh
new file mode 100644
index 000000000..e36389c67
--- /dev/null
+++ b/package/opensc/patches/patch-ltmain_sh
@@ -0,0 +1,30 @@
+--- opensc-0.11.13.orig/ltmain.sh	2011-01-09 00:58:43.000000000 +0100
++++ opensc-0.11.13/ltmain.sh	2011-01-09 00:57:54.000000000 +0100
+@@ -6635,27 +6635,6 @@ func_mode_link ()
+ 	      esac
+ 	    fi
+ 
+-	    # Hardcode the library path.
+-	    # Skip directories that are in the system default run-time
+-	    # search path.
+-	    case " $sys_lib_dlsearch_path " in
+-	    *" $absdir "*) ;;
+-	    *)
+-	      case "$compile_rpath " in
+-	      *" $absdir "*) ;;
+-	      *) func_append compile_rpath " $absdir" ;;
+-	      esac
+-	      ;;
+-	    esac
+-	    case " $sys_lib_dlsearch_path " in
+-	    *" $libdir "*) ;;
+-	    *)
+-	      case "$finalize_rpath " in
+-	      *" $libdir "*) ;;
+-	      *) func_append finalize_rpath " $libdir" ;;
+-	      esac
+-	      ;;
+-	    esac
+ 	  fi # $linkmode,$pass = prog,link...
+ 
+ 	  if test "$alldeplibs" = yes &&
diff --git a/package/opensc/patches/patch-src_Makefile_in b/package/opensc/patches/patch-src_Makefile_in
index 63d41a20e..f2891678f 100644
--- a/package/opensc/patches/patch-src_Makefile_in
+++ b/package/opensc/patches/patch-src_Makefile_in
@@ -1,6 +1,6 @@
---- opensc-0.11.13.orig/src/Makefile.in	2010-02-16 10:32:17.000000000 +0100
-+++ opensc-0.11.13/src/Makefile.in	2010-12-15 21:48:57.000000000 +0100
-@@ -260,8 +260,8 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil
+--- opensc-0.11.13.orig/src/Makefile.in	2011-01-09 00:58:50.000000000 +0100
++++ opensc-0.11.13/src/Makefile.in	2011-01-09 00:56:00.000000000 +0100
+@@ -263,8 +263,8 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil
  EXTRA_DIST = Makefile.mak
  
  # Order IS important
diff --git a/package/rpcbind/patches/patch-ltmain_sh b/package/rpcbind/patches/patch-ltmain_sh
new file mode 100644
index 000000000..1f5fa84b7
--- /dev/null
+++ b/package/rpcbind/patches/patch-ltmain_sh
@@ -0,0 +1,30 @@
+--- rpcbind-0.2.0.orig/ltmain.sh	2008-08-30 00:27:25.000000000 +0200
++++ rpcbind-0.2.0/ltmain.sh	2011-01-09 00:48:19.000000000 +0100
+@@ -2561,27 +2561,6 @@ EOF
+ 	      esac
+ 	    fi
+ 
+-	    # Hardcode the library path.
+-	    # Skip directories that are in the system default run-time
+-	    # search path.
+-	    case " $sys_lib_dlsearch_path " in
+-	    *" $absdir "*) ;;
+-	    *)
+-	      case "$compile_rpath " in
+-	      *" $absdir "*) ;;
+-	      *) compile_rpath="$compile_rpath $absdir"
+-	      esac
+-	      ;;
+-	    esac
+-	    case " $sys_lib_dlsearch_path " in
+-	    *" $libdir "*) ;;
+-	    *)
+-	      case "$finalize_rpath " in
+-	      *" $libdir "*) ;;
+-	      *) finalize_rpath="$finalize_rpath $libdir"
+-	      esac
+-	      ;;
+-	    esac
+ 	  fi # $linkmode,$pass = prog,link...
+ 
+ 	  if test "$alldeplibs" = yes &&
diff --git a/package/subversion/patches/patch-build_ltmain_sh b/package/subversion/patches/patch-build_ltmain_sh
new file mode 100644
index 000000000..b9315f8b3
--- /dev/null
+++ b/package/subversion/patches/patch-build_ltmain_sh
@@ -0,0 +1,30 @@
+--- subversion-1.6.12.orig/build/ltmain.sh	2010-03-31 20:37:12.000000000 +0200
++++ subversion-1.6.12/build/ltmain.sh	2011-01-09 01:50:49.000000000 +0100
+@@ -2561,27 +2561,6 @@ EOF
+ 	      esac
+ 	    fi
+ 
+-	    # Hardcode the library path.
+-	    # Skip directories that are in the system default run-time
+-	    # search path.
+-	    case " $sys_lib_dlsearch_path " in
+-	    *" $absdir "*) ;;
+-	    *)
+-	      case "$compile_rpath " in
+-	      *" $absdir "*) ;;
+-	      *) compile_rpath="$compile_rpath $absdir"
+-	      esac
+-	      ;;
+-	    esac
+-	    case " $sys_lib_dlsearch_path " in
+-	    *" $libdir "*) ;;
+-	    *)
+-	      case "$finalize_rpath " in
+-	      *" $libdir "*) ;;
+-	      *) finalize_rpath="$finalize_rpath $libdir"
+-	      esac
+-	      ;;
+-	    esac
+ 	  fi # $linkmode,$pass = prog,link...
+ 
+ 	  if test "$alldeplibs" = yes &&