diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-13 17:28:26 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-13 17:28:26 +0100 |
| commit | 61f978300c334c3e2466d24bed56ae6a1720d2b2 (patch) | |
| tree | a0d27c317075c0fd16b0787651e40496b8a0526b | |
| parent | fd6e91a86e8d3bff49f1e893ad243d8fc0e324a5 (diff) | |
| parent | 51fbbc0834011403f4a9d06d91b12addc68a64e1 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | mk/build.mk | 8 | ||||
| -rw-r--r-- | package/gdk-pixbuf/Makefile | 2 | ||||
| -rw-r--r-- | toolchain/uClibc/Makefile | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/mk/build.mk b/mk/build.mk index a72cd4f05..156555af3 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 \ 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/ 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 |