diff options
| -rw-r--r-- | CHANGES | 23 | ||||
| -rw-r--r-- | package/at/at.mk | 2 | ||||
| -rw-r--r-- | package/diffutils/diffutils.mk | 4 | ||||
| -rw-r--r-- | package/games/gnuchess/gnuchess.mk | 2 | ||||
| -rw-r--r-- | toolchain/gcc/Makefile.in | 5 | ||||
| -rw-r--r-- | toolchain/gcc/gcc-uclibc-4.x.mk | 22 |
6 files changed, 32 insertions, 26 deletions
@@ -18,19 +18,20 @@ New packages: cgilua, copas, coxpcall, ffmpeg, libsvgtiny, luafilesystem, luasocket, rings, wsapi, xavante, xterm - Updated/fixed packages: alsa-lib, alsamixergui, avahi, + Updated/fixed packages: alsa-lib, alsamixergui, at, avahi, berkeleydb, bash, blackbox, busybox, bzip2, cdrkit, cmake, dash, dhcp, dialog, diffutils, distcc, dmalloc, dnsmasq, dropbear, e2fsprogs, fbv, file, flex, fontconfig, gawk, gmpc, - gst-plugins-base, gst-plugins-good, gstreamer, gzip, intltool, - ipsec-tools, iptables, iw, libart, libcgi, libdrm, libfuse, - libgpg-error, libidn, liblockfile, libpng, lighttpd, links, - linux-fusion, lmbench, lrzsz, ltrace, make, module-init-tools, - mplayer, mysql_client, nbd, ncurses, neon, netcat, netperf, - ntfsprogs, openssl, php, qt, quagga, setserial, sdl, sdl_mixer, - sdl_sound, sdl_ttf, sqlite, squashfs, swfdec, tftpd, thttpd, - tn5250, tremor, usbutils, webif, wireless_tools, - xkeyboard-config, xserver_xorg-server, xvkbd + gnuchess, gst-plugins-base, gst-plugins-good, gstreamer, gzip, + intltool, ipsec-tools, iptables, iw, libart, libcgi, libdrm, + libfuse, libgpg-error, libidn, liblockfile, libpng, lighttpd, + links, linux-fusion, lmbench, lrzsz, ltrace, make, + module-init-tools, mplayer, mysql_client, nbd, ncurses, neon, + netcat, netperf, ntfsprogs, openssl, php, qt, quagga, + setserial, sdl, sdl_mixer, sdl_sound, sdl_ttf, sqlite, + squashfs, swfdec, tftpd, thttpd, tn5250, tremor, usbutils, + webif, wireless_tools, xkeyboard-config, xserver_xorg-server, + xvkbd Removed packages: modutils, portage, rxvt @@ -74,7 +75,7 @@ #2119: Tries to build kernel, although disabled in config #2143: buildroot compiler generates segfaulting statically linked exe.. #2155: Compression lzo don't set for ubifs - #2166: [SECURITY] Update libpng to 1.2.44 + #2161: [SECURITY] Update libpng to 1.2.44 #2167: Bump busybox to 1.17.0, convert to gentargets, drop 1.12, ... #2191: linux-fusion build fail #2221: Qt does not compile (dependencies not taken into account?) diff --git a/package/at/at.mk b/package/at/at.mk index 3eb99a4ed..57b7847ac 100644 --- a/package/at/at.mk +++ b/package/at/at.mk @@ -12,6 +12,8 @@ AT_INSTALL_TARGET = YES # no install-strip / install-exec AT_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install +AT_DEPENDENCIES = $(if $(BR2_PACKAGE_FLEX),flex) + AT_CONF_OPT = \ --with-jobdir=/var/spool/cron/atjobs \ --with-atspool=/var/spool/cron/atspool \ diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk index c0b383071..6ce71c927 100644 --- a/package/diffutils/diffutils.mk +++ b/package/diffutils/diffutils.mk @@ -9,6 +9,10 @@ DIFFUTILS_SITE:=$(BR2_GNU_MIRROR)/diffutils DIFFUTILS_INSTALL_STAGING = YES +DIFFUTILS_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_GETTEXT),gettext) \ + $(if $(BR2_PACKAGE_LIBINTL),libintl) + DIFFUTILS_CONF_ENV = ac_cv_func_strtod=yes ac_fsusage_space=yes \ fu_cv_sys_stat_statfs2_bsize=yes \ diff --git a/package/games/gnuchess/gnuchess.mk b/package/games/gnuchess/gnuchess.mk index d5a8dd65a..8e331a469 100644 --- a/package/games/gnuchess/gnuchess.mk +++ b/package/games/gnuchess/gnuchess.mk @@ -7,5 +7,7 @@ GNUCHESS_VERSION = 5.07 GNUCHESS_SOURCE = gnuchess-$(GNUCHESS_VERSION).tar.gz GNUCHESS_SITE = $(BR2_GNU_MIRROR)/chess +GNUCHESS_DEPENDENCIES = $(if $(BR2_PACKAGE_READLINE),readline) + $(eval $(call AUTOTARGETS,package/games,gnuchess)) diff --git a/toolchain/gcc/Makefile.in b/toolchain/gcc/Makefile.in index 0dcd8035e..4278bdbcf 100644 --- a/toolchain/gcc/Makefile.in +++ b/toolchain/gcc/Makefile.in @@ -50,11 +50,6 @@ EXTRA_GCC_CONFIG_OPTIONS+=--with-build-time-tools=$(STAGING_DIR)/$(REAL_GNU_TARG #EXTRA_GCC_CONFIG_OPTIONS+=--with-as=$(TARGET_CROSS)as endif -TARGET_GCC_FLAGS= CFLAGS_FOR_TARGET="$(TARGET_CFLAGS) $(TARGET_SOFT_FLOAT)" \ - CXXFLAGS_FOR_TARGET="$(TARGET_CFLAGS) $(TARGET_SOFT_FLOAT)" \ - CFLAGS="$(TARGET_CFLAGS) $(TARGET_SOFT_FLOAT)" \ - BOOT_CFLAGS="$(TARGET_CFLAGS) $(TARGET_SOFT_FLOAT)" - ifeq ($(BR2_PACKAGE_GCC_TARGET),y) EXTRA_TARGET_GCC_CONFIG_OPTIONS:= diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index 981026fff..924ba6eb7 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -397,7 +397,13 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_BUILD_DIR3)/.prepared (cd $(GCC_BUILD_DIR3); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ - $(TARGET_GCC_FLAGS) \ + CFLAGS_FOR_TARGET="$(TARGET_CFLAGS) $(TARGET_SOFT_FLOAT)" \ + CXXFLAGS_FOR_TARGET="$(TARGET_CFLAGS) $(TARGET_SOFT_FLOAT)" \ + CFLAGS="$(TARGET_CFLAGS) $(TARGET_SOFT_FLOAT)" \ + BOOT_CFLAGS="$(TARGET_CFLAGS) $(TARGET_SOFT_FLOAT)" \ + GCC_FOR_TARGET="$(TARGET_CC)" \ + CC_FOR_TARGET="$(TARGET_CC)" \ + CXX_FOR_TARGET="$(TARGET_CXX)" \ $(GCC_SRC_DIR)/configure $(QUIET) \ --prefix=/usr \ --build=$(GNU_HOST_NAME) \ @@ -444,15 +450,11 @@ $(TARGET_DIR)/usr/bin/gcc: $(GCC_BUILD_DIR3)/.compiled # Remove broken specs file (cross compile flag is set). rm -f $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/specs - -(cd $(TARGET_DIR)/bin && find -type f | xargs $(STRIPCMD) > /dev/null 2>&1) - -(cd $(TARGET_DIR)/usr/bin && find -type f | xargs $(STRIPCMD) > /dev/null 2>&1) - -(cd $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR) && $(STRIPCMD) cc1 cc1plus collect2 > /dev/null 2>&1) - -(cd $(TARGET_DIR)/usr/lib && $(STRIPCMD) libstdc++.so.*.*.* > /dev/null 2>&1) - -(cd $(TARGET_DIR)/lib && $(STRIPCMD) libgcc_s*.so.*.*.* > /dev/null 2>&1) - # - rm -f $(TARGET_DIR)/usr/lib/*.la* - #rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ - # $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc + # Remove useless copies of gcc, c++, g++ + rm -f $(TARGET_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc* + rm -f $(TARGET_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-g++* + rm -f $(TARGET_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-c++* + # Work around problem of missing syslimits.h if [ ! -f $(TARGET_DIR)/usr/$(GCC_LIB_SUBDIR)/$(GCC_INCLUDE_DIR)/syslimits.h ]; then \ echo "warning: working around missing syslimits.h"; \ |