Changeset 32977


Ignore:
Timestamp:
Aug 2, 2017, 2:17:29 AM (3 weeks ago)
Author:
brainslayer
Message:

remove libatomic. its not required anymore

Location:
src/router
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src/router/Makefile.octeon

    r31668 r32977  
    1919
    2020CONFIG_WPE72_SIZE?=0x3d0000
    21 #CONFIG_MUSL=y
     21CONFIG_MUSL=y
    2222
    2323#
     
    158158build_date:
    159159        echo "#define BUILD_DATE \"$(shell date +%D)\"" > ../../opt/build.h
    160 #       echo "CONFIG_MUSL=y" >> .config
     160        echo "CONFIG_MUSL=y" >> .config
    161161
    162162drop-sections   = .comment
     
    362362        -cp ${shell $(ARCH)-linux-gcc -print-file-name=ld.so.1} $(ARCH)-uclibc/target/lib/ld.so.1
    363363else
    364         cd $(ARCH)-uclibc/target/lib && ln -sf libc.so ld-musl-mips.so.1
     364        cd $(ARCH)-uclibc/target/lib && ln -sf libc.so ld-musl-mips64-sf.so.1
    365365endif
    366366
     
    427427                -L /lib \
    428428                -L /usr/lib \
    429                 --ldlib /lib/ld64-musl-mips.so.1 \
     429                --ldlib /lib/ld-musl-mips64-sf.so.1 \
    430430                --target $(ARCH)-linux-uclibc \
    431431                `cat /tmp/$(ARCHITECTURE)/mklibs-progs` 2>&1
     
    657657        cp $(LINUXDIR)/vmlinux $(ARCH)-uclibc/vfat/vmlinux.64
    658658        md5sum $(ARCH)-uclibc/vfat/vmlinux.64 > $(ARCH)-uclibc/vfat/vmlinux.64.md5
    659         ./gen_image.sh $(ARCH)-uclibc/erouter.image 8 $(ARCH)-uclibc/vfat 64 $(ARCH)-uclibc/root.fs
     659        ./gen_image.sh $(ARCH)-uclibc/erouter.image 8 $(ARCH)-uclibc/vfat 128 $(ARCH)-uclibc/root.fs
    660660        ./tools/wrap $(ARCH)-uclibc/erouter.image $(ARCH)-uclibc/erouter.bin
    661661
  • src/router/Makefile.x64

    r32972 r32977  
    274274        cd $(ARCH)-uclibc/target/lib && ln -sf libc.so ld-musl-x86_64.so.1
    275275endif
    276         -cp ${shell $(ARCH)-linux-gcc -print-file-name=libatomic.so.1} $(ARCH)-uclibc/target/lib/libatomic.so.1
     276#       -cp ${shell $(ARCH)-linux-gcc -print-file-name=libatomic.so.1} $(ARCH)-uclibc/target/lib/libatomic.so.1
    277277ifeq ($(CONFIG_LIBDL),y)
    278278        -cp ${shell $(ARCH)-linux-gcc -print-file-name=libdl.so.0} $(ARCH)-uclibc/target/lib/libdl.so.0
  • src/router/Makefile.x86

    r31696 r32977  
    274274        -cp ${shell $(ARCH)-linux-gcc -print-file-name=librt.so.0} $(ARCH)-uclibc/target/lib/librt.so.0
    275275endif
    276         -cp ${shell $(ARCH)-linux-gcc -print-file-name=libatomic.so.1} $(ARCH)-uclibc/target/lib/libatomic.so.1
     276#       -cp ${shell $(ARCH)-linux-gcc -print-file-name=libatomic.so.1} $(ARCH)-uclibc/target/lib/libatomic.so.1
    277277ifeq ($(CONFIG_LIBNSL),y)
    278278        -cp ${shell $(ARCH)-linux-gcc -print-file-name=libnsl.so.0} $(ARCH)-uclibc/target/lib/libnsl.so.0
Note: See TracChangeset for help on using the changeset viewer.