Changeset 3031


Ignore:
Timestamp:
2006-01-20T20:18:37+01:00 (12 years ago)
Author:
wbx
Message:

add gcc 3.4.4 patch from trunk, libgcc is linked explictly. tested nmap and kismet, both works still fine, PLEASE do not forget to rebuild your toolchain, otherwise you will create _broken_ images. VERY IMPORTANT make distclean, before compile on your existing buildroot

Location:
branches/whiterussian/openwrt
Files:
2 added
10 edited

Legend:

Unmodified
Added
Removed
  • branches/whiterussian/openwrt/package/Config.in

    r1980 r3031  
    9595source "package/libelf/Config.in" 
    9696source "package/libevent/Config.in" 
     97source "package/base-files/Config.in" # libgcc 
    9798source "package/libgd/Config.in" 
    9899source "package/libgdbm/Config.in" 
  • branches/whiterussian/openwrt/package/base-files/Makefile

    r2984 r3031  
    44 
    55PKG_NAME:=base-files 
    6 PKG_RELEASE:=6 
     6PKG_RELEASE:=7 
    77PKG_BUILD_DIR:=$(BUILD_DIR)/base-files 
    88 
     
    2020IPKG_GCC:=$(PACKAGE_DIR)/libgcc_$(GCC_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk 
    2121 
    22 PACKAGES:=$(IPKG_BASE) $(IPKG_LIBC) $(IPKG_GCC) 
     22PACKAGES:=$(IPKG_BASE) $(IPKG_LIBC)  
     23PACKAGES_INSTALL:=$(IPKG_BASE) $(IPKG_LIBC)  
     24 
     25ifeq ($(BR2_PACKAGE_LIBGCC),y) 
     26PACKAGES+=$(IPKG_GCC) 
     27PACKAGES_INSTALL+=$(IPKG_GCC) 
     28endif 
     29ifeq ($(BR2_PACKAGE_LIBGCC),m) 
     30PACKAGES+=$(IPKG_GCC) 
     31endif 
    2332 
    2433$(PKG_BUILD_DIR)/.prepared: 
     
    6372        $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_GCC) ipkg/libgcc.control $(GCC_VERSION)-$(PKG_RELEASE) $(ARCH) 
    6473        mkdir -p $(IDIR_GCC)/lib 
    65         cp -fpR $(STAGING_DIR)/lib/libgcc*.so.* $(IDIR_GCC)/lib/ 
     74        cp -fpR $(STAGING_DIR)/lib/libgcc_s.so.* $(IDIR_GCC)/lib/ 
    6675        -$(STRIP) $(IDIR_GCC)/lib/* 
    6776        $(IPKG_BUILD) $(IDIR_GCC) $(PACKAGE_DIR) 
     
    7483install: compile 
    7584        mkdir -p $(TARGET_DIR) 
    76         $(IPKG) install $(PACKAGES) 
     85        $(IPKG) install $(PACKAGES_INSTALL) 
  • branches/whiterussian/openwrt/package/kismet/Makefile

    r1873 r3031  
    5959        $(MAKE) -C $(PKG_BUILD_DIR) \ 
    6060                CC=$(TARGET_CC) \ 
    61                 LIBS="-L$(STAGING_DIR)/lib -fno-builtin -nostdinc++ -nodefaultlibs -luClibc++ -lc -lm" \ 
     61                LIBS="-L$(STAGING_DIR)/lib -fno-builtin -nostdinc++ -nodefaultlibs -luClibc++ -lc -lm -lgcc" \ 
    6262                CPPFLAGS="-I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include -I$(LINUX_DIR)/include"  
    6363        touch $@ 
  • branches/whiterussian/openwrt/package/kismet/ipkg/kismet-server.control

    r2208 r3031  
    22Priority: optional 
    33Section: net 
    4 Depends: uclibc++, libpcap 
     4Depends: libgcc, uclibc++, libpcap 
    55Description: The kismet server 
    66 Kismet is an 802.11 layer2 wireless network detector, 
  • branches/whiterussian/openwrt/package/nmap/Makefile

    r2021 r3031  
    2727                CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ 
    2828                LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ 
    29                 LIBS="-nodefaultlibs -luClibc++ -lc -lm" \ 
     29                LIBS="-nodefaultlibs -luClibc++ -lc -lm -lgcc" \ 
    3030                ac_cv_prog_CXX="$(TARGET_CXX)" \ 
    3131                ./configure \ 
  • branches/whiterussian/openwrt/package/nmap/ipkg/nmap.control

    r2208 r3031  
    22Priority: optional 
    33Section: net 
    4 Depends: libpcap, libpcre, uclibc++ 
     4Depends: libgcc, libpcap, libpcre, uclibc++ 
    55Description: Nmap is a free open source utility for network exploration or security auditing. 
  • branches/whiterussian/openwrt/target/linux/imagebuilder/lists/default.brcm-2.4

    r2984 r3031  
    1515kmod-switch 
    1616kmod-wlcompat 
    17 libgcc 
    1817mtd 
    1918nvram 
  • branches/whiterussian/openwrt/target/linux/imagebuilder/lists/micro.brcm-2.4

    r2984 r3031  
    1212kmod-switch 
    1313kmod-wlcompat 
    14 libgcc 
    1514mtd 
    1615nvram 
  • branches/whiterussian/openwrt/target/linux/imagebuilder/lists/pptp.brcm-2.4

    r2984 r3031  
    1515kmod-switch 
    1616kmod-wlcompat 
    17 libgcc 
    1817mtd 
    1918nvram 
  • branches/whiterussian/openwrt/toolchain/gcc/Makefile

    r1637 r3031  
    189189endif 
    190190endif 
     191# We do another ugly hack here because the standard behaviour is 
     192# to include a reference to libgcc.so.1 in all binaries. For flash space 
     193# saving, we change the specs file to link in a static libgcc here.  
     194        if [ ! -f $(STAGING_DIR)/lib/gcc/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs ] ; then \ 
     195                echo staging dir specs file is missing ; \ 
     196                /bin/false ; \ 
     197        fi; 
     198        if grep -q as-needed $(STAGING_DIR)/lib/gcc/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs; then \ 
     199                patch -d $(STAGING_DIR)/lib/gcc/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/ -p0 < ./$(GCC_VERSION)/static-libgcc.patch.conditional ; \ 
     200        fi; 
    191201 
    192202source: $(DL_DIR)/$(GCC_SOURCE) 
Note: See TracChangeset for help on using the changeset viewer.