diff options
| -rw-r--r-- | CHANGES | 6 | ||||
| -rw-r--r-- | package/Config.in | 1 | ||||
| -rw-r--r-- | package/gmp/gmp.mk | 1 | ||||
| -rw-r--r-- | package/hostap/Config.in | 9 | ||||
| -rw-r--r-- | package/hostap/hostap.mk | 72 | ||||
| -rw-r--r-- | package/mpfr/mpfr.mk | 1 | ||||
| -rw-r--r-- | package/x11r7/xfont_font-util/xfont_font-util.mk | 6 | ||||
| -rw-r--r-- | toolchain/binutils/binutils.mk | 1 | ||||
| -rw-r--r-- | toolchain/gcc/gcc-uclibc-4.x.mk | 5 |
9 files changed, 16 insertions, 86 deletions
@@ -3,13 +3,15 @@ Fixes all over the tree. Updated/fixed packages: busybox, ipsec-tools, libgtk2, madplay, - netsnmp, pango, sylpheed, qt + netsnmp, pango, sylpheed, qt, xfont_font-util - Removed packages: openmotif, xpdf + Removed packages: hostap, openmotif, xpdf Issues resolved (http://bugs.uclibc.org): #165: openmotif does not build + #1147: Remove obsolete hostap package + #1183: make source fails to download gmp, mpfr and patches 2010.02-rc2, Released February 23th, 2010: diff --git a/package/Config.in b/package/Config.in index b21604d5c..5dc7c8d5e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -138,7 +138,6 @@ source "package/dnsmasq/Config.in" source "package/dropbear/Config.in" source "package/ethtool/Config.in" source "package/haserl/Config.in" -source "package/hostap/Config.in" source "package/hostapd/Config.in" source "package/ifplugd/Config.in" source "package/iperf/Config.in" diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk index 7ae78c79d..a3488b836 100644 --- a/package/gmp/gmp.mk +++ b/package/gmp/gmp.mk @@ -93,6 +93,7 @@ $(GMP_HOST_DIR)/lib/libgmp$(HOST_LIBEXT): $(GMP_DIR2)/.configured $(MAKE) -C $(GMP_DIR2) install host-libgmp: $(GMP_HOST_DIR)/lib/$(GMP_HOST_BINARY) +host-libgmp-source: libgmp-source host-libgmp-clean: rm -rf $(GMP_HOST_DIR) -$(MAKE) -C $(GMP_DIR2) clean diff --git a/package/hostap/Config.in b/package/hostap/Config.in deleted file mode 100644 index 74431b787..000000000 --- a/package/hostap/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_HOSTAP - bool "hostap" - depends on BR2_DEPRECATED - select BR2_PACKAGE_PCMCIA - help - Linux driver for wireless LAN cards based on Intersil's - Prism2/2.5/3 chipset. - - http://hostap.epitest.fi/ diff --git a/package/hostap/hostap.mk b/package/hostap/hostap.mk deleted file mode 100644 index d0af5fd1d..000000000 --- a/package/hostap/hostap.mk +++ /dev/null @@ -1,72 +0,0 @@ -############################################################# -# -# hostap -# -# Note! Host AP driver was added into the main kernel tree in Linux v2.6.14. -# The version in the kernel tree should be used instead of this external -# hostap-driver package. -# The external releases are only for older kernel versions and all -# the future development will be in the main kernel tree. -# -############################################################# -HOSTAP_VERSION=0.4.9 -HOSTAP_SOURCE=hostap-driver-$(HOSTAP_VERSION).tar.gz -HOSTAP_SITE=http://hostap.epitest.fi/releases -HOSTAP_DIR=$(BUILD_DIR)/hostapd-$(HOSTAP_VERSION) - -$(DL_DIR)/$(HOSTAP_SOURCE): - $(call DOWNLOAD,$(HOSTAP_SITE),$(HOSTAP_SOURCE)) - -hostap-source: $(DL_DIR)/$(HOSTAP_SOURCE) - -$(HOSTAP_DIR)/.unpacked: $(DL_DIR)/$(HOSTAP_SOURCE) - $(ZCAT) $(DL_DIR)/$(HOSTAP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - mv -f $(BUILD_DIR)/hostap $(HOSTAP_DIR) - touch $@ - -$(HOSTAP_DIR)/.configured: $(HOSTAP_DIR)/.unpacked - #$(SED) "s,/.*#define PRISM2_DOWNLOAD_SUPPORT.*/,#define PRISM2_DOWNLOAD_SUPPORT,g" \ - # $(HOSTAP_DIR)/driver/modules/hostap_config.h - touch $@ - -$(HOSTAP_DIR)/utils/hostap_crypt_conf: $(HOSTAP_DIR)/.configured - $(MAKE) -C $(HOSTAP_DIR)/utils \ - CC=$(TARGET_CC) \ - CFLAGS="-Os -Wall $(TARGET_CFLAGS) -I../driver/modules" - $(MAKE) -C $(HOSTAP_DIR)/hostapd \ - CC=$(TARGET_CC) \ - CFLAGS="-Os -Wall $(TARGET_CFLAGS) -I../driver/modules -I../utils" - touch -c $(HOSTAP_DIR)/driver/modules/hostap.o - -$(TARGET_DIR)//usr/bin/hostap_crypt_conf: $(HOSTAP_DIR)/utils/hostap_crypt_conf - # Make the dir - rm -rf $(HOSTAP_TARGET_MODULE_DIR) - mkdir -p $(HOSTAP_TARGET_MODULE_DIR) - # Copy the pcmcia-cs conf file - mkdir -p $(TARGET_DIR)/etc/pcmcia - cp -af $(HOSTAP_DIR)/driver/etc/hostap_cs.conf $(TARGET_DIR)/etc/pcmcia/ - # Copy The Utils - cp -af $(HOSTAP_DIR)/utils/hostap_crypt_conf $(TARGET_DIR)/usr/bin/ - cp -af $(HOSTAP_DIR)/utils/hostap_diag $(TARGET_DIR)/usr/bin/ - cp -af $(HOSTAP_DIR)/utils/prism2_param $(TARGET_DIR)/usr/bin/ - cp -af $(HOSTAP_DIR)/utils/prism2_srec $(TARGET_DIR)/usr/bin/ - # Copy hostapd - cp -af $(HOSTAP_DIR)/hostapd/hostapd $(TARGET_DIR)/usr/sbin/ - -hostap: pcmcia $(TARGET_DIR)//usr/bin/hostap_crypt_conf - -hostap-clean: - $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(HOSTAP_DIR) uninstall - -$(MAKE) -C $(HOSTAP_DIR) clean - -hostap-dirclean: - rm -rf $(HOSTAP_DIR) - -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(BR2_PACKAGE_HOSTAP),y) -TARGETS+=hostap -endif diff --git a/package/mpfr/mpfr.mk b/package/mpfr/mpfr.mk index 595edc3cb..a7834dd9b 100644 --- a/package/mpfr/mpfr.mk +++ b/package/mpfr/mpfr.mk @@ -107,6 +107,7 @@ $(MPFR_HOST_DIR)/lib/libmpfr$(HOST_LIBEXT): $(MPFR_DIR2)/.configured $(MAKE) -C $(MPFR_DIR2) install host-libmpfr: $(MPFR_HOST_DIR)/lib/$(MPFR_HOST_BINARY) +host-libmpfr-source: libmpfr-source host-libmpfr-clean: rm -rf $(MPFR_HOST_DIR) -$(MAKE) -C $(MPFR_DIR2) clean diff --git a/package/x11r7/xfont_font-util/xfont_font-util.mk b/package/x11r7/xfont_font-util/xfont_font-util.mk index 88dce3843..cd777af9a 100644 --- a/package/x11r7/xfont_font-util/xfont_font-util.mk +++ b/package/x11r7/xfont_font-util/xfont_font-util.mk @@ -8,11 +8,13 @@ XFONT_FONT_UTIL_VERSION = 1.0.1 XFONT_FONT_UTIL_SOURCE = font-util-$(XFONT_FONT_UTIL_VERSION).tar.bz2 XFONT_FONT_UTIL_SITE = http://xorg.freedesktop.org/releases/individual/font XFONT_FONT_UTIL_DEPENDENCIES = host-pkg-config +XFONT_FONT_UTIL_INSTALL_STAGING = YES +XFONT_FONT_UTIL_INSTALL_TARGET = NO define XFONT_FONT_UTIL_POST_INSTALL_FIXES - $(@D)/post-install.sh $(STAGING_DIR) + package/x11r7/xfont_font-util/post-install.sh $(STAGING_DIR) endef XFONT_FONT_UTIL_POST_INSTALL_STAGING_HOOKS += XFONT_FONT_UTIL_POST_INSTALL_FIXES -$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-util))
\ No newline at end of file +$(eval $(call AUTOTARGETS,package/x11r7,xfont_font-util)) diff --git a/toolchain/binutils/binutils.mk b/toolchain/binutils/binutils.mk index 288a000f5..77e7d3d51 100644 --- a/toolchain/binutils/binutils.mk +++ b/toolchain/binutils/binutils.mk @@ -37,6 +37,7 @@ endif ifndef BINUTILS_NO_MPFR BINUTILS_HOST_PREREQ:=$(TOOLCHAIN_DIR)/gmp/lib/libgmp$(HOST_LIBEXT) \ $(TOOLCHAIN_DIR)/mpfr/lib/libmpfr$(HOST_LIBEXT) +HOST_SOURCE += host-libgmp-source host-libmpfr-source BINUTILS_TARGET_PREREQ:=$(TARGET_DIR)/usr/lib/libgmp$(LIBTGTEXT) \ $(TARGET_DIR)/usr/lib/libmpfr$(LIBTGTEXT) diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index 6f65cb35f..cf76e8ad1 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -107,6 +107,7 @@ endif ifndef GCC_NO_MPFR GCC_WITH_HOST_GMP=--with-gmp=$(GMP_HOST_DIR) GCC_WITH_HOST_MPFR=--with-mpfr=$(MPFR_HOST_DIR) +HOST_SOURCE += host-libgmp-source host-libmpfr-source ifeq ($(BR2_INSTALL_FORTRAN),y) GCC_TARGET_LANGUAGES:=$(GCC_TARGET_LANGUAGES),fortran @@ -459,6 +460,10 @@ ifeq ($(findstring x4.3,x$(GCC_VERSION)),x4.3) GCC_LIB_SUBDIR=lib/gcc/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION) GCC_INCLUDE_DIR:=include-fixed endif +ifeq ($(findstring x4.4,x$(GCC_VERSION)),x4.4) +GCC_LIB_SUBDIR=lib/gcc/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION) +GCC_INCLUDE_DIR:=include-fixed +endif $(TARGET_DIR)/usr/bin/gcc: $(GCC_BUILD_DIR3)/.compiled PATH=$(TARGET_PATH) DESTDIR=$(TARGET_DIR) \ |