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

mk/build.mk

@@ -16,13 +16,9 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_MAKE_JOBS=4 \
 			ADK_PACKAGE_GRUB=n \
 			ADK_PACKAGE_BASE_FILES=y \
-			ADK_PACKAGE_MGETTY=n \
-			ADK_COMPILE_HEIMDAL=n \
-			ADK_PACKAGE_HEIMDAL_PKINIT=n \
-			ADK_PACKAGE_HEIMDAL_SERVER=n \
-			ADK_PACKAGE_LIBHEIMDAL=n \
-			ADK_PACKAGE_LIBHEIMDAL_CLIENT=n \
 			ADK_PACKAGE_PYTHON=n \
+			ADK_TOOLCHAIN_GCC_USE_SSP=n \
+			ADK_TOOLCHAIN_GCC_USE_LTO=n \
 			BUSYBOX_BBCONFIG=n \
 			BUSYBOX_SELINUX=n \
 			BUSYBOX_INSTALL_NO_USR=n \

package/gdk-pixbuf/Makefile

@@ -8,7 +8,7 @@ PKG_VERSION:=		2.23.0
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		a7d6c5f2fe2d481149ed3ba807b5c043
 PKG_DESCR:=		GDK pixbuf library
-PKG_BUILDDEP:=		jpeg
+PKG_BUILDDEP:=		jpeg libtiff
 PKG_SECTION:=		libs
 PKG_SITES:=		http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.23/
 

toolchain/uClibc/Makefile

@@ -19,7 +19,7 @@ $(WRKBUILD)/.headers:
 ifneq ($(ADK_DEBUG),)
 	$(SED) 's,DOSTRIP,DODEBUG,' ${WRKBUILD}/.config
 endif
-ifneq ($(ADK_TOOLCHAIN_GCC_USE_SSP),)
+ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y)
 	$(SED) 's,.*UCLIBC_HAS_SSP,UCLIBC_HAS_SSP=y,' ${WRKBUILD}/.config
 	echo "UCLIBC_HAS_SSP_COMPAT=n" >> ${WRKBUILD}/.config
 	echo "SSP_QUICK_CANARY=n" >> ${WRKBUILD}/.config