[uml] fix linking failures against memcpy on x86_64, fix runtime tested successfully

[openwrt.git] / toolchain / uClibc / Makefile

diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index e8407fb..7206df2 100644 (file)
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -10,11 +10,11 @@ include $(INCLUDE_DIR)/target.mk
 PKG_NAME:=uClibc
 PKG_VERSION:=$(call qstrip,$(CONFIG_UCLIBC_VERSION))
 ifeq ($(CONFIG_UCLIBC_VERSION_NPTL),y)
 PKG_NAME:=uClibc
 PKG_VERSION:=$(call qstrip,$(CONFIG_UCLIBC_VERSION))
 ifeq ($(CONFIG_UCLIBC_VERSION_NPTL),y)

-  PKG_SOURCE_URL:=http://www.uclibc.org/svn/branches/uClibc-nptl
-  PKG_SOURCE_PROTO:=svn
-  PKG_SOURCE_VERSION:=25804
+  PKG_SOURCE_URL:=git://git.busybox.net/uClibc
+  PKG_SOURCE_PROTO:=git
+  PKG_SOURCE_VERSION:=0949826e9501e9f08767aeb476ea1464bf95f218

   PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
   PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

-  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-r$(PKG_SOURCE_VERSION).tar.gz
+  PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz

   LIBC_SO_VERSION:=0.9.30-svn
 else
   PKG_SOURCE_URL:=http://www.uclibc.org/downloads
   LIBC_SO_VERSION:=0.9.30-svn
 else
   PKG_SOURCE_URL:=http://www.uclibc.org/downloads


@@ -74,7 +74,7 @@ define Host/Prepare
                -e 's,^.*UCLIBC_HAS_SHADOW.*,UCLIBC_HAS_SHADOW=$(if $(CONFIG_SHADOW_PASSWORDS),y,n),g' \
                $(HOST_BUILD_DIR)/.config
        $(MAKE) -C $(HOST_BUILD_DIR)/extra/config conf KBUILD_HAVE_NLS= HOSTCFLAGS="-DKBUILD_NO_NLS"
                -e 's,^.*UCLIBC_HAS_SHADOW.*,UCLIBC_HAS_SHADOW=$(if $(CONFIG_SHADOW_PASSWORDS),y,n),g' \
                $(HOST_BUILD_DIR)/.config
        $(MAKE) -C $(HOST_BUILD_DIR)/extra/config conf KBUILD_HAVE_NLS= HOSTCFLAGS="-DKBUILD_NO_NLS"

-       PATH=$(TARGET_PATH) $(MAKE) -C $(HOST_BUILD_DIR) \
+       PATH='$(TARGET_PATH)' $(MAKE) -C $(HOST_BUILD_DIR) \

                PREFIX="$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/" \
                DEVEL_PREFIX=/usr/ \
                RUNTIME_PREFIX="$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/" \
                PREFIX="$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/" \
                DEVEL_PREFIX=/usr/ \
                RUNTIME_PREFIX="$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/" \


@@ -88,12 +88,13 @@ endef
 define Host/Configure
 endef
 
 define Host/Configure
 endef
 

-UCLIBC_MAKE := PATH=$(TARGET_PATH) $(MAKE) -C $(HOST_BUILD_DIR) \
+UCLIBC_MAKE = PATH='$(TARGET_PATH)' $(MAKE) -C $(HOST_BUILD_DIR) \

        $(TARGET_CONFIGURE_OPTS) \
        DEVEL_PREFIX=/usr/ \
        RUNTIME_PREFIX=/ \
        HOSTCC="$(HOSTCC)" \
        CPU_CFLAGS="$(TARGET_CFLAGS)" \
        $(TARGET_CONFIGURE_OPTS) \
        DEVEL_PREFIX=/usr/ \
        RUNTIME_PREFIX=/ \
        HOSTCC="$(HOSTCC)" \
        CPU_CFLAGS="$(TARGET_CFLAGS)" \

+       LIBGCC="$(subst libgcc.a,libgcc_initial.a,$(shell $(TARGET_CC) -print-libgcc-file-name))" \

        DOSTRIP=""
 
 define Host/Compile
        DOSTRIP=""
 
 define Host/Compile


@@ -101,6 +102,7 @@ define Host/Compile
        $(UCLIBC_MAKE) PREFIX= all
        $(UCLIBC_MAKE) PREFIX="$(TOOLCHAIN_DIR)/" install_runtime install_dev
        ln -sf ../../lib/libc.so.0 $(TOOLCHAIN_DIR)/usr/lib/libc.so
        $(UCLIBC_MAKE) PREFIX= all
        $(UCLIBC_MAKE) PREFIX="$(TOOLCHAIN_DIR)/" install_runtime install_dev
        ln -sf ../../lib/libc.so.0 $(TOOLCHAIN_DIR)/usr/lib/libc.so

+       $(CP) $(HOST_BUILD_DIR)/libc/libc_so.a $(TOOLCHAIN_DIR)/usr/lib/

 #      ( cd $(TOOLCHAIN_DIR) ; \
 #              for d in lib usr/lib ; do \
 #                for f in libc.so libpthread.so libgcc_s.so ; do \
 #      ( cd $(TOOLCHAIN_DIR) ; \
 #              for d in lib usr/lib ; do \
 #                for f in libc.so libpthread.so libgcc_s.so ; do \


@@ -114,6 +116,7 @@ endef
 
 define Host/Install
        $(UCLIBC_MAKE) PREFIX= utils
 
 define Host/Install
        $(UCLIBC_MAKE) PREFIX= utils

+       $(INSTALL_DIR) $(TOOLCHAIN_DIR)/bin

        $(INSTALL_DIR) $(TOOLCHAIN_DIR)/usr/bin
        $(INSTALL_BIN) \
                $(HOST_BUILD_DIR)/utils/ldd \
        $(INSTALL_DIR) $(TOOLCHAIN_DIR)/usr/bin
        $(INSTALL_BIN) \
                $(HOST_BUILD_DIR)/utils/ldd \