Changeset 15006


Ignore:
Timestamp:
2009-03-24T03:06:12+01:00 (7 years ago)
Author:
nbd
Message:

add uclibc-nptl

Location:
trunk/toolchain/uClibc
Files:
17 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/toolchain/uClibc/Config.in

    r15005 r15006  
    2222endchoice 
    2323 
     24config UCLIBC_VERSION_NPTL 
     25        bool "Use NPTL branch" 
     26        depends on TOOLCHAINOPTS && USE_UCLIBC 
     27        depends on UCLIBC_VERSION_0_9_30 
     28 
     29 
    2430config UCLIBC_EXTRA_VERSION 
    2531        string 
     
    2834        default "snapshot"   if UCLIBC_VERSION_SNAPSHOT 
    2935        default ".2"         if UCLIBC_VERSION_0_9_28 
    30         default ".1"         if UCLIBC_VERSION_0_9_30 
     36        default ".1"         if UCLIBC_VERSION_0_9_30 && !UCLIBC_VERSION_NPTL 
    3137        default "" 
    3238        help 
  • trunk/toolchain/uClibc/Makefile

    r15004 r15006  
    1212PKG_EXTRAVERSION:=$(call qstrip,$(CONFIG_UCLIBC_EXTRA_VERSION)) 
    1313PKG_VERSION_SNAPSHOT:=$(call qstrip,$(CONFIG_UCLIBC_VERSION_SNAPSHOT)) 
     14ifeq ($(CONFIG_UCLIBC_VERSION_NPTL),y) 
     15  PKG_SOURCE_URL:=http://www.uclibc.org/svn/branches/uClibc-nptl 
     16  PKG_SOURCE_PROTO:=svn 
     17  PKG_SOURCE_VERSION:=25804 
     18  PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)+nptl 
     19  PKG_SOURCE:=$(PKG_NAME)-nptl-r$(PKG_SOURCE_VERSION).tar.gz 
     20  PKG_EXTRAVERSION:= 
     21else 
    1422ifeq ($(PKG_VERSION_SNAPSHOT),y) 
    1523  PKG_SOURCE_URL:=http://www.uclibc.org/downloads/snapshots 
     
    1927  PKG_SOURCE:=uClibc-$(PKG_VERSION)$(PKG_EXTRAVERSION).tar.bz2 
    2028endif 
     29endif 
    2130PATCH_DIR:=$(firstword $(wildcard ./patches-$(PKG_VERSION)$(PKG_EXTRAVERSION) ./patches-$(PKG_VERSION))) 
    2231CONFIG_DIR:=$(firstword $(wildcard ./config-$(PKG_VERSION)$(PKG_EXTRAVERSION) ./config-$(PKG_VERSION))) 
     32PATCH_DIR:=$(if $(CONFIG_UCLIBC_VERSION_NPTL),./patches-nptl,$(PATCH_DIR)) 
     33CONFIG_DIR:=$(if $(CONFIG_UCLIBC_VERSION_NPTL),./config-nptl,$(CONFIG_DIR)) 
     34PATCH_DIR:=$(if $(PKG_VERSION_SNAPSHOT),,$(PATCH_DIR)) 
     35CONFIG_DIR:=$(if $(PKG_VERSION_SNAPSHOT),./config-0.9.30,$(CONFIG_DIR)) 
    2336 
    2437PKG_MD5SUM_0.9.28.2 = 959f25286e317f0d9e2103445c5a14c2 
     
    2841PKG_MD5SUM=$(PKG_MD5SUM_$(PKG_VERSION)$(PKG_EXTRAVERSION)) 
    2942 
    30 ifeq ($(PKG_VERSION_SNAPSHOT),y) 
    31   PATCH_DIR:= 
    32   CONFIG_DIR:=./config-0.9.30 
    33   PKG_MD5SUM:= 
    34 endif 
    3543 
    3644ifeq ($(PKG_VERSION_SNAPSHOT),y) 
    3745  HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/uClibc-$(PKG_EXTRAVERSION) 
    3846else 
    39   HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/uClibc-$(PKG_VERSION)$(PKG_EXTRAVERSION) 
     47  HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/uClibc-$(PKG_VERSION)$(PKG_EXTRAVERSION)$(if $(CONFIG_UCLIBC_VERSION_NPTL),+nptl) 
    4048endif 
    4149 
Note: See TracChangeset for help on using the changeset viewer.