diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-08-04 08:27:03 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-08-04 08:37:22 +0200 |
| commit | ccb0b79b6f0210dc550dfbf7dadad38d1388501c (patch) | |
| tree | 340c43fd2b6df9f6974fa2242400b00385b9c41d | |
| parent | 18e99a1f0fee9eb55888be3df630adacd04e9af0 (diff) | |
add musl git support
| -rw-r--r-- | mk/fetch.mk | 6 | ||||
| -rw-r--r-- | target/config/Config.in.libc.choice | 4 | ||||
| -rw-r--r-- | toolchain/glibc/Makefile.inc | 9 | ||||
| -rw-r--r-- | toolchain/musl/Makefile.inc | 9 |
4 files changed, 21 insertions, 7 deletions
diff --git a/mk/fetch.mk b/mk/fetch.mk index 6c3cec4a1..2446a0720 100644 --- a/mk/fetch.mk +++ b/mk/fetch.mk @@ -72,7 +72,11 @@ $(1): rm -rf $${PKG_NAME}-$${PKG_VERSION}; \ git clone $${PKG_REPO} $${PKG_NAME}-$${PKG_VERSION}; \ rm -rf $${PKG_NAME}-$${PKG_VERSION}/.git; \ - tar cJf $${PKG_NAME}-$${PKG_VERSION}.tar.xz $${PKG_NAME}-$${PKG_VERSION}; \ + if [ "$${PKG_NAME}" = "musl" ];then \ + tar czf $${PKG_NAME}-$${PKG_VERSION}.tar.gz $${PKG_NAME}-$${PKG_VERSION}; \ + else \ + tar cJf $${PKG_NAME}-$${PKG_VERSION}.tar.xz $${PKG_NAME}-$${PKG_VERSION}; \ + fi; \ rm -rf $${PKG_NAME}-$${PKG_VERSION}; \ : check the size here; \ [[ ! -e $$$$filename ]] || exit 0; \ diff --git a/target/config/Config.in.libc.choice b/target/config/Config.in.libc.choice index 732593ce3..cca46a246 100644 --- a/target/config/Config.in.libc.choice +++ b/target/config/Config.in.libc.choice @@ -97,8 +97,8 @@ config ADK_TARGET_LIB_UCLIBC_GIT select ADK_DISABLE_CHECKSUM depends on ADK_TARGET_LIB_UCLIBC -config ADK_TARGET_LIB_MUSL_1_0_3 - prompt "1.0.3" +config ADK_TARGET_LIB_MUSL_1_0_4 + prompt "1.0.4" boolean depends on ADK_TARGET_LIB_MUSL diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc index f5f397d35..287254733 100644 --- a/toolchain/glibc/Makefile.inc +++ b/toolchain/glibc/Makefile.inc @@ -2,10 +2,15 @@ # material, please see the LICENCE file in the top-level directory. PKG_NAME:= glibc -PKG_VERSION:= 2.19 +ifeq ($(ADK_LIBC_VERSION),git) +PKG_VERSION:= git +PKG_REPO:= git://sourceware.org/git/glibc.git +else +PKG_VERSION:= $(ADK_LIBC_VERSION) +PKG_SITES:= ${MASTER_SITE_GNU:=glibc/} +endif PKG_RELEASE:= 1 PKG_MD5SUM:= e26b8cc666b162f999404b03970f14e4 -PKG_SITES:= ${MASTER_SITE_GNU:=glibc/} GLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \ --host=$(GNU_TARGET_NAME) \ --with-headers=$(STAGING_TARGET_DIR)/usr/include \ diff --git a/toolchain/musl/Makefile.inc b/toolchain/musl/Makefile.inc index 067a371d4..9b0fb88b8 100644 --- a/toolchain/musl/Makefile.inc +++ b/toolchain/musl/Makefile.inc @@ -2,8 +2,13 @@ # material, please see the LICENCE file in the top-level directory. PKG_NAME:= musl -PKG_VERSION:= 1.1.4 +ifeq ($(ADK_LIBC_VERSION),git) +PKG_VERSION:= git +PKG_REPO:= git://git.musl-libc.org/musl +else +PKG_VERSION:= $(ADK_LIBC_VERSION) +PKG_SITES:= http://www.musl-libc.org/releases/ +endif PKG_RELEASE:= 1 PKG_MD5SUM:= f18f3bdbe088438cd64a5313c19a7312 -PKG_SITES:= http://www.musl-libc.org/releases/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz |