projects
/
openwrt
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
apex: change Source URL for Apex package
[openwrt/.git]
/
toolchain
/
eglibc
/
common.mk
diff --git
a/toolchain/eglibc/common.mk
b/toolchain/eglibc/common.mk
index 9f7916ee7a3b706fa2a4a996f10ac9e3e0a06b2b..f1e3f304559c151d8c027a2e6aff6c3ddde9daf7 100644
(file)
--- a/
toolchain/eglibc/common.mk
+++ b/
toolchain/eglibc/common.mk
@@
-15,15
+15,12
@@
PKG_SOURCE_VERSION:=$(PKG_REVISION)
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-r$(PKG_REVISION)
PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.bz2
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-r$(PKG_REVISION)
PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.bz2
-ifneq ($(CONFIG_EGLIBC_VERSION_2_13),)
- PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_13
-endif
-ifneq ($(CONFIG_EGLIBC_VERSION_2_14),)
- PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_14
-endif
ifneq ($(CONFIG_EGLIBC_VERSION_2_15),)
PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_15
endif
ifneq ($(CONFIG_EGLIBC_VERSION_2_15),)
PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_15
endif
+ifneq ($(CONFIG_EGLIBC_VERSION_2_19),)
+ PKG_SOURCE_URL:=svn://svn.eglibc.org/branches/eglibc-2_19
+endif
PATCH_DIR:=$(PATH_PREFIX)/patches/$(PKG_VERSION)
PATCH_DIR:=$(PATH_PREFIX)/patches/$(PKG_VERSION)
@@
-57,6
+54,7
@@
EGLIBC_CONFIGURE:= \
export libc_cv_ssp=no
export ac_cv_header_cpuid_h=yes
export libc_cv_ssp=no
export ac_cv_header_cpuid_h=yes
+export HOST_CFLAGS := $(HOST_CFLAGS) -idirafter $(CURDIR)/$(PATH_PREFIX)/include
define Host/SetToolchainInfo
$(SED) 's,^\(LIBC_TYPE\)=.*,\1=$(PKG_NAME),' $(TOOLCHAIN_DIR)/info.mk
define Host/SetToolchainInfo
$(SED) 's,^\(LIBC_TYPE\)=.*,\1=$(PKG_NAME),' $(TOOLCHAIN_DIR)/info.mk
@@
-82,7
+80,9
@@
define Host/Prepare
$(call Host/Prepare/Default)
ln -snf $(PKG_SOURCE_SUBDIR) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
$(SED) 's,y,n,' $(HOST_BUILD_DIR)/libc/option-groups.defaults
$(call Host/Prepare/Default)
ln -snf $(PKG_SOURCE_SUBDIR) $(BUILD_DIR_TOOLCHAIN)/$(PKG_NAME)
$(SED) 's,y,n,' $(HOST_BUILD_DIR)/libc/option-groups.defaults
+ifneq ($(CONFIG_EGLIBC_VERSION_2_15),)
ln -sf ../ports $(HOST_BUILD_DIR)/libc/
ln -sf ../ports $(HOST_BUILD_DIR)/libc/
+endif
endef
define Host/Clean
endef
define Host/Clean