diff options
| -rw-r--r-- | make/gcc_target.mk | 14 | ||||
| -rw-r--r-- | make/ncurses.mk | 6 | ||||
| -rw-r--r-- | make/netkittelnet.mk | 1 | ||||
| -rw-r--r-- | make/openssl.mk | 4 | ||||
| -rw-r--r-- | make/uclibc_toolchain.mk | 2 | ||||
| -rw-r--r-- | make/zlib.mk | 4 |
6 files changed, 19 insertions, 12 deletions
diff --git a/make/gcc_target.mk b/make/gcc_target.mk index 931927f93..b674e96b7 100644 --- a/make/gcc_target.mk +++ b/make/gcc_target.mk @@ -25,7 +25,7 @@ TARGET_LANGUAGES:=c,c++ # If you want multilib enabled, enable this... -#MULTILIB:=--enable-multilib +MULTILIB:=--enable-multilib ############################################################# # @@ -250,11 +250,17 @@ $(TARGET_DIR)/usr/bin/gcc: $(GCC_BUILD_DIR3)/.compiled mandir=$(TARGET_DIR)/usr/man \ toolexecdir=$(TARGET_DIR)/lib/gcc-lib/$(GNU_TARGET_NAME) \ -C $(GCC_BUILD_DIR3) install; - rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ - $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc - (cd $(TARGET_DIR)/usr/bin; ln -fs gcc cc) -$(STRIP) $(TARGET_DIR)/bin/* -$(STRIP) $(TARGET_DIR)/usr/bin/* + (cd $(TARGET_DIR)/usr/bin; ln -fs gcc cc) + -mv $(TARGET_DIR)/usr/bin/$(GNU_TARGET_NAME)-cpp $(TARGET_DIR)/usr/bin/cpp + -mv $(TARGET_DIR)/usr/bin/$(GNU_TARGET_NAME)-gcc $(TARGET_DIR)/usr/bin/gcc + -mv $(TARGET_DIR)/usr/bin/$(GNU_TARGET_NAME)-c++ $(TARGET_DIR)/usr/bin/c++ + -mv $(TARGET_DIR)/usr/bin/$(GNU_TARGET_NAME)-g++ $(TARGET_DIR)/usr/bin/g++ + -mv $(TARGET_DIR)/usr/bin/$(GNU_TARGET_NAME)-c++filt $(TARGET_DIR)/usr/bin/c++filt + rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ + $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc + touch -c $(TARGET_DIR)/usr/bin/gcc gcc_target: uclibc_target binutils_target $(TARGET_DIR)/usr/bin/gcc diff --git a/make/ncurses.mk b/make/ncurses.mk index 5c9e20cf9..9d1ab044f 100644 --- a/make/ncurses.mk +++ b/make/ncurses.mk @@ -5,7 +5,7 @@ # ############################################################# # Copyright (C) 2002 by Ken Restivo <ken@246gt.com> -# $Id: ncurses.mk,v 1.17 2003/01/19 06:07:22 andersen Exp $ +# $Id: ncurses.mk,v 1.18 2003/01/20 19:24:02 andersen Exp $ # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Library General Public License as @@ -92,7 +92,7 @@ $(TARGET_DIR)/lib/libncurses.so: $(STAGING_DIR)/lib/libncurses.a cp -dpf $(STAGING_DIR)/usr/share/terminfo/$${i} $(TARGET_DIR)/usr/share/terminfo/; \ done -$(TARGET_DIR)/usr/include/ncurses.h: $(TARGET_DIR)/lib/libncurses.so +$(TARGET_DIR)/usr/lib/libncurses.a: $(TARGET_DIR)/lib/libncurses.so cp -dpf $(NCURSES_DIR)/include/curses.h $(TARGET_DIR)/usr/include/ncurses.h cp -dpf $(NCURSES_DIR)/include/term.h $(TARGET_DIR)/usr/include/ cp -dpf $(NCURSES_DIR)/include/unctrl.h $(TARGET_DIR)/usr/include/ @@ -101,7 +101,7 @@ $(TARGET_DIR)/usr/include/ncurses.h: $(TARGET_DIR)/lib/libncurses.so (cd $(TARGET_DIR)/usr/lib; ln -fs libncurses.a libcurses.a) (cd $(TARGET_DIR)/usr/lib; ln -fs libncurses.a libtermcap.a) (cd $(TARGET_DIR)/usr/include; ln -fs ncurses.h curses.h) - touch -c $(TARGET_DIR)/usr/include/ncurses.h + touch -c $(NCURSES_DIR)/usr/lib/libncurses.a ncurses-headers: $(TARGET_DIR)/usr/include/ncurses.h diff --git a/make/netkittelnet.mk b/make/netkittelnet.mk index d1b84cb03..a082764af 100644 --- a/make/netkittelnet.mk +++ b/make/netkittelnet.mk @@ -39,6 +39,7 @@ $(NETKITTELNET_DIR)/$(NETKITTELNET_BINARY): $(NETKITTELNET_DIR)/.configured $(TARGET_DIR)/$(NETKITTELNET_TARGET_BINARY): $(NETKITTELNET_DIR)/$(NETKITTELNET_BINARY) # Only install a few selected items... mkdir -p $(TARGET_DIR)/usr/sbin + rm -f $(TARGET_DIR)/$(NETKITTELNET_TARGET_BINARY) cp $(NETKITTELNET_DIR)/$(NETKITTELNET_BINARY) $(TARGET_DIR)/$(NETKITTELNET_TARGET_BINARY) # Enable telnet in inetd perl -i -p -e "s~^#telnet.*~telnet\tstream\ttcp\tnowait\troot\t/usr/sbin/telnetd\t/usr/sbin/telnetd~;" $(TARGET_DIR)/etc/inetd.conf diff --git a/make/openssl.mk b/make/openssl.mk index 5792e5841..cb3ae9353 100644 --- a/make/openssl.mk +++ b/make/openssl.mk @@ -42,12 +42,12 @@ $(TARGET_DIR)/lib/libcrypto.so.0: $(STAGING_DIR)/lib/libcrypto.so.0 cp -fa $(STAGING_DIR)/lib/libssl.so* $(TARGET_DIR)/lib/ #cp -fa $(STAGING_DIR)/bin/openssl $(TARGET_DIR)/bin/ -$(TARGET_DIR)/usr/include/openssl/crypto.h: $(TARGET_DIR)/lib/libcrypto.so.0 +$(TARGET_DIR)/usr/lib/libssl.a: $(TARGET_DIR)/lib/libcrypto.so.0 mkdir -p $(TARGET_DIR)/usr/include cp -a $(STAGING_DIR)/include/openssl $(TARGET_DIR)/usr/include/ cp -dpf $(STAGING_DIR)/lib/libssl.a $(TARGET_DIR)/usr/lib/ cp -dpf $(STAGING_DIR)/lib/libcrypto.a $(TARGET_DIR)/usr/lib/ - touch -c $(TARGET_DIR)/usr/include/openssl/crypto.h + touch -c $(TARGET_DIR)/usr/lib/libssl.a openssl-headers: $(TARGET_DIR)/usr/include/openssl/crypto.h diff --git a/make/uclibc_toolchain.mk b/make/uclibc_toolchain.mk index 01104bf1a..09f06e842 100644 --- a/make/uclibc_toolchain.mk +++ b/make/uclibc_toolchain.mk @@ -27,7 +27,7 @@ ifeq ($(USE_UCLIBC_TOOLCHAIN),true) TARGET_LANGUAGES:=c,c++ # If you want multilib enabled, enable this... -#MULTILIB:=--enable-multilib +MULTILIB:=--enable-multilib ############################################################# # diff --git a/make/zlib.mk b/make/zlib.mk index aaf8f3cad..a16c33763 100644 --- a/make/zlib.mk +++ b/make/zlib.mk @@ -49,12 +49,12 @@ $(TARGET_DIR)/lib/libz.so.1.1.4: $(STAGING_DIR)/lib/libz.so.1.1.4 -$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libz.so* touch -c $(TARGET_DIR)/lib/libz.so.1.1.4 -$(TARGET_DIR)/usr/include/zlib.h: $(TARGET_DIR)/lib/libz.so.1.1.4 +$(TARGET_DIR)/usr/lib/libz.a: $(TARGET_DIR)/lib/libz.so.1.1.4 mkdir -p $(TARGET_DIR)/usr/include cp -dpf $(STAGING_DIR)/include/zlib.h $(TARGET_DIR)/usr/include/ cp -dpf $(STAGING_DIR)/include/zconf.h $(TARGET_DIR)/usr/include/ cp -dpf $(STAGING_DIR)/lib/libz.a $(TARGET_DIR)/usr/lib/ - touch -c $(TARGET_DIR)/usr/include/zlib.h + touch -c $(TARGET_DIR)/usr/lib/libz.a zlib-headers: $(TARGET_DIR)/usr/include/zlib.h |