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

7 files changed, 58 insertions, 7 deletions

diff --git a/package/libtool/Makefile b/package/libtool/Makefile
index 08842b638..b2710ee63 100644
--- a/package/libtool/Makefile
+++ b/package/libtool/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libtool
 PKG_VERSION:=		2.4.2
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		d2f3b7d4627e69e13514a40e72a24d50
 PKG_DESCR:=		a generic dynamic object loading library
 PKG_SECTION:=		lang
diff --git a/package/libtool/patches/patch-configure b/package/libtool/patches/patch-configure
new file mode 100644
index 000000000..e95e35cce
--- /dev/null
+++ b/package/libtool/patches/patch-configure
@@ -0,0 +1,20 @@
+--- libtool-2.4.2.orig/configure	2011-10-17 12:18:58.000000000 +0200
++++ libtool-2.4.2/configure	2013-10-31 16:17:18.508406500 +0100
+@@ -9340,7 +9340,7 @@ $as_echo_n "checking whether the $compil
+   enable_shared_with_static_runtimes=no
+   export_dynamic_flag_spec=
+   export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+-  hardcode_automatic=no
++  hardcode_automatic=yes
+   hardcode_direct=no
+   hardcode_direct_absolute=no
+   hardcode_libdir_flag_spec=
+@@ -13694,7 +13694,7 @@ hardcode_libdir_flag_spec_CXX=
+ hardcode_libdir_separator_CXX=
+ hardcode_minus_L_CXX=no
+ hardcode_shlibpath_var_CXX=unsupported
+-hardcode_automatic_CXX=no
++hardcode_automatic_CXX=yes
+ inherit_rpath_CXX=no
+ module_cmds_CXX=
+ module_expsym_cmds_CXX=
diff --git a/package/libtool/patches/patch-libltdl_config_ltmain_m4sh b/package/libtool/patches/patch-libltdl_config_ltmain_m4sh
index a1650449e..d6ebba7b6 100644
--- a/package/libtool/patches/patch-libltdl_config_ltmain_m4sh
+++ b/package/libtool/patches/patch-libltdl_config_ltmain_m4sh
@@ -1,6 +1,6 @@
---- libtool-2.4.orig/libltdl/config/ltmain.m4sh	2010-09-22 16:45:18.000000000 +0200
-+++ libtool-2.4/libltdl/config/ltmain.m4sh	2011-03-29 22:49:51.801818754 +0200
-@@ -5051,7 +5051,7 @@ func_mode_link ()
+--- libtool-2.4.2.orig/libltdl/config/ltmain.m4sh	2011-10-17 12:17:05.000000000 +0200
++++ libtool-2.4.2/libltdl/config/ltmain.m4sh	2013-10-30 18:43:07.053853500 +0100
+@@ -5066,7 +5066,7 @@ func_mode_link ()
        # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
        -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
        -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
diff --git a/package/libtool/patches/patch-libltdl_configure b/package/libtool/patches/patch-libltdl_configure
new file mode 100644
index 000000000..95fffd3c1
--- /dev/null
+++ b/package/libtool/patches/patch-libltdl_configure
@@ -0,0 +1,11 @@
+--- libtool-2.4.2.orig/libltdl/configure	2011-10-17 12:19:47.000000000 +0200
++++ libtool-2.4.2/libltdl/configure	2013-10-31 16:17:57.695906500 +0100
+@@ -8690,7 +8690,7 @@ $as_echo_n "checking whether the $compil
+   enable_shared_with_static_runtimes=no
+   export_dynamic_flag_spec=
+   export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+-  hardcode_automatic=no
++  hardcode_automatic=yes
+   hardcode_direct=no
+   hardcode_direct_absolute=no
+   hardcode_libdir_flag_spec=
diff --git a/package/libtool/patches/patch-libltdl_m4_libtool_m4 b/package/libtool/patches/patch-libltdl_m4_libtool_m4
new file mode 100644
index 000000000..1ef213478
--- /dev/null
+++ b/package/libtool/patches/patch-libltdl_m4_libtool_m4
@@ -0,0 +1,20 @@
+--- libtool-2.4.2.orig/libltdl/m4/libtool.m4	2011-10-17 12:17:05.000000000 +0200
++++ libtool-2.4.2/libltdl/m4/libtool.m4	2013-10-31 16:50:11.016431400 +0100
+@@ -4592,7 +4592,7 @@ m4_if([$1], [CXX], [
+   _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+   _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+   _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+-  _LT_TAGVAR(hardcode_automatic, $1)=no
++  _LT_TAGVAR(hardcode_automatic, $1)=yes
+   _LT_TAGVAR(hardcode_direct, $1)=no
+   _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+   _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+@@ -5840,7 +5840,7 @@ _LT_TAGVAR(hardcode_libdir_flag_spec, $1
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=
+ _LT_TAGVAR(hardcode_minus_L, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+-_LT_TAGVAR(hardcode_automatic, $1)=no
++_LT_TAGVAR(hardcode_automatic, $1)=yes
+ _LT_TAGVAR(inherit_rpath, $1)=no
+ _LT_TAGVAR(module_cmds, $1)=
+ _LT_TAGVAR(module_expsym_cmds, $1)=
diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile
index 4d5577eb1..d033af17d 100644
--- a/package/libxml2/Makefile
+++ b/package/libxml2/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libxml2
 PKG_VERSION:=		2.9.1
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		9c0cfef285d5c4a5c80d00904ddab380
 PKG_DESCR:=		XML C parser and toolkit
 PKG_SECTION:=		libs
@@ -18,7 +18,7 @@ PKG_OPTS:=		dev
 PKG_SUBPKGS:=		LIBXML2 LIBXML2_PYTHON
 PKGSD_LIBXML2_PYTHON:=	XML python bindings
 PKGSC_LIBXML2_PYTHON:=	libs
-PKGSB_LIBXML2_PYTHON:=	python2-host
+PKGSB_LIBXML2_PYTHON:=	python2
 
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS+=		libmix
diff --git a/package/tslib/Makefile b/package/tslib/Makefile
index 7dcf0b2a2..6ed54e524 100644
--- a/package/tslib/Makefile
+++ b/package/tslib/Makefile
@@ -12,7 +12,7 @@ PKG_DESCR:=		touchscreen library
 PKG_SECTION:=		libs
 PKG_BUILDDEP:=		autotool
 PKG_URL:=		http://tslib.berlios.de/
-PKG_SITES:=		http://download.berlios.de/tslib/
+PKG_SITES:=		http://openadk.org/distfiles/
 PKG_NEED_CXX:=		1
 PKG_OPTS:=		dev