Changeset 2817


Ignore:
Timestamp:
2006-01-04T09:37:19+01:00 (12 years ago)
Author:
wbx
Message:

patch for spec file of gcc 3.4.4, so that libgss library is not
automatically linked into every binary. explicitely link it into needed
packages (kismet, nmap, samba) and add dependencies.
idea and patch from sven-ola, thx. Saves 16 kb in the default squashfs
images.

Location:
trunk/openwrt
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/openwrt/package/Config.in

    r2796 r2817  
    184184source "package/flac/Config.in"  # libflac 
    185185source "package/freetype/Config.in"  # libfreetype 
     186source "package/base-files/Config.in" # libgcc 
    186187source "package/libgcrypt/Config.in" 
    187188source "package/libgd/Config.in" 
  • trunk/openwrt/package/base-files/Makefile

    r2765 r2817  
    3030IPKG_LIBGCC:=$(PACKAGE_DIR)/libgcc_$(LIBGCC_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk 
    3131 
    32 PACKAGES:=$(IPKG_BASE) $(IPKG_UCLIBC) $(IPKG_LIBGCC) 
     32PACKAGES:=$(IPKG_BASE) $(IPKG_UCLIBC)  
     33PACKAGES_INSTALL:=$(IPKG_BASE) $(IPKG_UCLIBC)  
     34 
     35ifeq ($(BR2_PACKAGE_LIBGCC),y) 
     36PACKAGES_INSTALL+=$(IPKG_LIBGCC) 
     37endif 
     38ifeq ($(BR2_PACKAGE_LIBGCC),m) 
     39PACKAGES+=$(IPKG_LIBGCC) 
     40endif 
    3341 
    3442$(PKG_BUILD_DIR)/.prepared: 
     
    8997install-targets: compile 
    9098        mkdir -p $(TARGET_DIR) 
    91         $(IPKG) install $(PACKAGES) 
     99        $(IPKG) install $(PACKAGES_INSTALL) 
  • trunk/openwrt/package/base-files/ipkg/uclibc.control

    r2638 r2817  
    22Priority: optional 
    33Section: net 
    4 Depends: base-files, libgcc 
     4Depends: base-files 
    55Description: Standard C library for embedded Linux systems 
  • trunk/openwrt/package/kismet/Makefile

    r2330 r2817  
    2929                CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(LINUX_DIR)/include" \ 
    3030                LDFLAGS="-nodefaultlibs -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ 
    31                 LIBS="-luClibc++ -lc -lm" \ 
     31                LIBS="-luClibc++ -lc -lm -lgcc" \ 
    3232                ./configure \ 
    3333                        --target=$(GNU_TARGET_NAME) \ 
     
    5959$(PKG_BUILD_DIR)/.built: 
    6060        $(MAKE) -C $(PKG_BUILD_DIR) \ 
    61                 LIBS="-luClibc++ -lc -lm" \ 
     61                LIBS="-luClibc++ -lc -lm -lgcc" \ 
    6262                all 
    6363        touch $@ 
  • trunk/openwrt/package/kismet/ipkg/kismet.control

    r2638 r2817  
    22Priority: optional 
    33Section: net 
    4 Depends: kismet-client, kismet-server  
     4Depends: libgcc, kismet-client, kismet-server  
    55Description: kismet 
    66 Kismet is an 802.11 layer2 wireless network detector, 
  • trunk/openwrt/package/nmap/Makefile

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

    r2638 r2817  
    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. 
  • trunk/openwrt/package/samba/Makefile

    r1996 r2817  
    5959                CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE -DNDEBUG -DSHMEM_SIZE=524288 -Dfcntl=fcntl64" \ 
    6060                CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ 
    61                 LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \ 
     61                LDFLAGS="-lgcc_s -L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \ 
    6262                ac_cv_lib_cups_httpConnect=no \ 
    6363                ac_cv_sizeof_int=4 \ 
  • trunk/openwrt/package/samba/ipkg/samba.control

    r2638 r2817  
    22Priority: optional 
    33Section: net 
    4 Depends: 
     4Depends: libgcc 
    55Description: NetBIOS/SMB file and print server 
  • trunk/openwrt/toolchain/gcc/Makefile

    r1638 r2817  
    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.