Commit 074b6689 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Merge branch 'fixes-20100729' of git://git.busybox.net/~tpetazzoni/git/buildroot

parents 18abd4aa e7584697

boot/u-boot/u-boot.mk

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ $(U_BOOT_DIR)/.patched: $(U_BOOT_DIR)/.unpacked 
	toolchain/patch-kernel.sh $(U_BOOT_DIR) boot/u-boot \

		u-boot-$(U_BOOT_VERSION)-\*.patch \

		u-boot-$(U_BOOT_VERSION)-\*.patch.$(ARCH)

ifneq ($(strip $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR)),"")

ifneq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR)),)

	toolchain/patch-kernel.sh $(U_BOOT_DIR) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) u-boot-$(U_BOOT_VERSION)-\*.patch

endif

	touch $@

linux/linux.mk

+13 −0
Original line number Diff line number Diff line
@@ -160,3 +160,16 @@ linux26-rebuild-with-initramfs: $(LINUX26_DIR)/.stamp_initramfs_rebuilt 
ifeq ($(BR2_LINUX_KERNEL),y)

TARGETS+=linux26

endif



# Checks to give errors that the user can understand

ifeq ($(BR2_LINUX_KERNEL_USE_DEFCONFIG),y)

ifeq ($(call qstrip,$(BR2_LINUX_KERNEL_DEFCONFIG)),)

$(error No kernel defconfig name specified, check your BR2_LINUX_KERNEL_DEFCONFIG setting)

endif

endif



ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG),y)

ifeq ($(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE)),)

$(error No kernel configuration file specified, check your BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE setting)

endif

endif
 
 No newline at end of file

package/Makefile.in

+10 −1
Original line number Diff line number Diff line
@@ -93,11 +93,20 @@ LIBC=uclibc 
else ifeq ($(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y)

LIBC=uclibc

else

LIBC=

LIBC=gnu

endif



# The ABI suffix is a bit special on ARM, as it needs to be

# -uclibcgnueabi for uClibc EABI, -uclibc for uClibc OABI, -gnueabi

# for glibc EABI and -gnu for glibc OABI. This means that the LIBC and

# ABI aren't strictly orthogonal, which explains why we need the test

# on LIBC below.

ifeq ($(BR2_ARM_EABI),y)

ifeq ($(LIBC),uclibc)

ABI=gnueabi

else

ABI=eabi

endif

endif



REAL_GNU_TARGET_NAME=$(ARCH)-unknown-linux-$(LIBC)$(ABI)

package/avahi/avahi.mk

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ AVAHI_CONF_OPT = --localstatedir=/var \ 
		--with-autoipd-user=default \

		--with-autoipd-group=default



AVAHI_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-intltool

AVAHI_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-intltool host-pkg-config



ifneq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_AVAHI_AUTOIPD),)

AVAHI_DEPENDENCIES += libdaemon

package/cairo/Config.in

+1 −0
Original line number Diff line number Diff line
@@ -30,5 +30,6 @@ config BR2_PACKAGE_CAIRO_PNG 
config BR2_PACKAGE_CAIRO_SVG

	bool "svg support"

	select BR2_PACKAGE_CAIRO_PNG

	select BR2_PACKAGE_CAIRO_PDF



endif