merge conflict, update hash

5 files changed, 39 insertions, 36 deletions

diff --git a/package/mysql/Makefile b/package/mysql/Makefile
index 3bea7abcd..1f56a911c 100644
--- a/package/mysql/Makefile
+++ b/package/mysql/Makefile
@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		mysql
-PKG_VERSION:=		5.6.19
-PKG_RELEASE:=		2
-PKG_HASH:=		80ef3aae048866539380e7e330d9f1034f0ee50ddfb9c662570132492678b09f
+PKG_VERSION:=		5.6.22
+PKG_RELEASE:=		1
+PKG_HASH:=		c4d2dfabb20a8e26e8437dff41f366520001eb031ffd77fbfcde70d0073fc9f6
 PKG_DESCR:=		mysql client library
 PKG_SECTION:=		libs/db
 PKG_DEPENDS:=		libncurses zlib libevent
@@ -34,8 +34,7 @@ CMAKE_FLAGS+=		-DSTACK_DIRECTION=1 \
 			-DCURSES_INCLUDE_PATH="$(STAGING_TARGET_DIR)/usr/include"
 
 host-configure:
-	cd ${WRKBUILD} && PATH='${HOST_PATH}' \
-		cmake .
+	cd ${WRKBUILD} && PATH='${HOST_PATH}' cmake .
 
 host-build:
 	cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
diff --git a/package/mysql/patches/patch-cmake_os_Linux_cmake b/package/mysql/patches/patch-cmake_os_Linux_cmake
index be27d5517..69189db05 100644
--- a/package/mysql/patches/patch-cmake_os_Linux_cmake
+++ b/package/mysql/patches/patch-cmake_os_Linux_cmake
@@ -1,7 +1,7 @@
---- mysql-5.6.17.orig/cmake/os/Linux.cmake	2014-03-14 20:07:26.000000000 +0100
-+++ mysql-5.6.17/cmake/os/Linux.cmake	2014-04-04 10:11:45.000000000 +0200
-@@ -23,14 +23,6 @@ SET(TARGET_OS_LINUX 1)
- SET(HAVE_NPTL 1)
+--- mysql-5.6.22.orig/cmake/os/Linux.cmake	2014-11-20 23:39:51.000000000 -0600
++++ mysql-5.6.22/cmake/os/Linux.cmake	2014-12-26 10:30:24.216372609 -0600
+@@ -22,14 +22,6 @@ INCLUDE(CheckSymbolExists)
+ SET(TARGET_OS_LINUX 1)
  SET(_GNU_SOURCE 1)
  
 -# Fix CMake (< 2.8) flags. -rdynamic exports too many symbols.
diff --git a/package/mysql/patches/patch-include_my_global_h b/package/mysql/patches/patch-include_my_global_h
new file mode 100644
index 000000000..37c22fd7a
--- /dev/null
+++ b/package/mysql/patches/patch-include_my_global_h
@@ -0,0 +1,15 @@
+--- mysql-5.6.22.orig/include/my_global.h	2014-11-20 23:39:51.000000000 -0600
++++ mysql-5.6.22/include/my_global.h	2014-12-26 10:33:04.736371139 -0600
+@@ -769,11 +769,7 @@ inline unsigned long long my_double2ulon
+   #define my_isnan(X) std::isnan(X)
+   #define my_isinf(X) std::isinf(X)
+ #else
+-  #ifdef HAVE_LLVM_LIBCPP /* finite is deprecated in libc++ */
+-    #define my_isfinite(X) isfinite(X)
+-  #else
+-    #define my_isfinite(X) finite(X)
+-  #endif
++  #define my_isfinite(X) isfinite(X)
+   #define my_isnan(X) isnan(X)
+   #ifdef HAVE_ISINF
+     /* System-provided isinf() is available and safe to use */
diff --git a/package/xz/Makefile b/package/xz/Makefile
index e9abb1411..41c09abba 100644
--- a/package/xz/Makefile
+++ b/package/xz/Makefile
@@ -1,12 +1,12 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-include ${ADK_TOPDIR}/rules.mk
+include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		xz
-PKG_VERSION:=		5.0.5
-PKG_RELEASE:=		2
-PKG_HASH:=		5dcffe6a3726d23d1711a65288de2e215b4960da5092248ce63c99d50093b93a
+PKG_VERSION:=		5.2.0
+PKG_RELEASE:=		1
+PKG_HASH:=		231ef369982240bb20ed7cffa52bb12a4a297ce6871f480ab85e8a7ba98bf3d6
 PKG_DESCR:=		compression utility
 PKG_SECTION:=		app/archive
 PKG_DEPENDS:=		libxz
@@ -17,28 +17,28 @@ PKG_LIBNAME:=		libxz
 PKG_OPTS:=		dev
 PKG_BB:=		1
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 PKG_SUBPKGS:=		XZ LIBXZ
 PKGSD_LIBXZ:=		xz compression library
 PKGSC_LIBXZ:=		libs/comp
 
-include ${ADK_TOPDIR}/mk/host.mk
-include ${ADK_TOPDIR}/mk/package.mk
+include $(ADK_TOPDIR)/mk/host.mk
+include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call HOST_template,XZ,xz,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,XZ,xz,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBXZ,libxz,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBXZ},${PKGSD_LIBXZ},${PKGSC_LIBXZ},${PKG_OPTS}))
+$(eval $(call HOST_template,XZ,xz,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,XZ,xz,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
+$(eval $(call PKG_template,LIBXZ,libxz,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_LIBXZ),$(PKGSD_LIBXZ),$(PKGSC_LIBXZ),$(PKG_OPTS)))
 
 HOST_CONFIGURE_ARGS+=	--disable-shared
 
 xz-install:
-	${INSTALL_DIR} ${IDIR_XZ}/usr/bin
-	${CP} ${WRKINST}/usr/bin/* ${IDIR_XZ}/usr/bin
+	$(INSTALL_DIR) $(IDIR_XZ)/usr/bin
+	$(CP) $(WRKINST)/usr/bin/* $(IDIR_XZ)/usr/bin
 
 libxz-install:
-	${INSTALL_DIR} ${IDIR_LIBXZ}/usr/lib
-	${CP} ${WRKINST}/usr/lib/liblzma.so* ${IDIR_LIBXZ}/usr/lib
+	$(INSTALL_DIR) $(IDIR_LIBXZ)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/liblzma.so* $(IDIR_LIBXZ)/usr/lib
 
-include ${ADK_TOPDIR}/mk/host-bottom.mk
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/host-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/xz/patches/patch-build-aux_ltmain_sh b/package/xz/patches/patch-build-aux_ltmain_sh
deleted file mode 100644
index b9ae6dddf..000000000
--- a/package/xz/patches/patch-build-aux_ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- xz-5.0.0.orig/build-aux/ltmain.sh	2010-10-23 16:48:07.000000000 +0200
-+++ xz-5.0.0/build-aux/ltmain.sh	2011-01-17 17:54:37.000000000 +0100
-@@ -5840,7 +5840,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=*| \
--      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
-+      -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"