From 59847d1d06a7cb8c51f1ce730060a9f5819c95eb Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 12 Jan 2011 20:49:53 +0100 Subject: disable LTO and SSP for bulk builds --- mk/build.mk | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/mk/build.mk b/mk/build.mk index ef551741a..eaf547c0b 100644 --- a/mk/build.mk +++ b/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 \ -- cgit v1.2.3 From 1cfd01852aa45f83506ba67ea3528495918115b3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 12 Jan 2011 20:50:08 +0100 Subject: add libtiff build dependency --- package/gdk-pixbuf/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gdk-pixbuf/Makefile b/package/gdk-pixbuf/Makefile index b73bc688e..24b55275c 100644 --- a/package/gdk-pixbuf/Makefile +++ b/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/ -- cgit v1.2.3 From 51fbbc0834011403f4a9d06d91b12addc68a64e1 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 12 Jan 2011 22:19:24 +0100 Subject: fix ssp support, logic error --- toolchain/uClibc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile index cc63b9e5f..6dd77146f 100644 --- a/toolchain/uClibc/Makefile +++ b/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 -- cgit v1.2.3