summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-10-11 17:09:48 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2013-10-11 17:09:48 +0200
commit992497f936f7dc4e791c7af4c3b2103f5d5e990d (patch)
treef663b1d71d65f7256b050a802aa0f131dbb76991 /package
parent7e1ae3b97f8d4fefa6a3b82c31e76f04cf151da2 (diff)
parenteea24184593776645fcca6feb40fbdc0e89fb50d (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
-rw-r--r--package/boost/Makefile1
-rw-r--r--package/eglibc/Makefile13
2 files changed, 2 insertions, 12 deletions
diff --git a/package/boost/Makefile b/package/boost/Makefile
index cce3246fa..d0ac60891 100644
--- a/package/boost/Makefile
+++ b/package/boost/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:= 2
PKG_MD5SUM:= efbfbff5a85a9330951f243d0a46e4b9
PKG_DESCR:= boost C++ library
PKG_SECTION:= libs
+PKG_BUILDDEP:= gettext-tiny
PKG_URL:= http://www.boost.org/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=boost/}
diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile
index 56ee27870..3261ba314 100644
--- a/package/eglibc/Makefile
+++ b/package/eglibc/Makefile
@@ -24,16 +24,6 @@ INSTALL_STYLE:= manual
# compile nothing, eglibc is already build in toolchain directory
do-install:
-ifeq ($(ADK_TARGET_WITH_MULTILIB),y)
- for abi in $(TABI); do \
- ${INSTALL_DIR} $(IDIR_EGLIBC)/lib$${abi/*:/} $(IDIR_EGLIBC)/usr/lib$${abi/*:/} ; \
- $(CP) $(STAGING_TARGET_DIR)/lib/ld* $(IDIR_EGLIBC)/lib$${abi/*:/} ; \
- -for file in libc libcrypt libdl libm libresolv libutil libnsl libnss_dns libnss_files; do \
- $(CP) $(STAGING_TARGET_DIR)-$${abi/*:/}/lib/$$file.so* $(IDIR_EGLIBC)/lib$${abi/*:/}; \
- $(CP) $(STAGING_TARGET_DIR)-$${abi/*:/}/lib/$$file-$(PKG_VERSION).so $(IDIR_EGLIBC)/lib$${abi/*:/}; \
- done ; \
- done
-else
${INSTALL_DIR} $(IDIR_EGLIBC)/$(ADK_TARGET_LIBC_PATH) \
$(IDIR_EGLIBC)/usr/lib $(IDIR_EGLIBC)/usr/bin
$(CP) $(STAGING_TARGET_DIR)/lib/ld* $(IDIR_EGLIBC)/$(ADK_TARGET_LIBC_PATH)
@@ -45,10 +35,9 @@ else
ifeq ($(ADK_LOCALES),y)
$(CP) $(STAGING_TARGET_DIR)/usr/bin/locale $(IDIR_EGLIBC)/usr/bin
endif
-endif
${INSTALL_DIR} $(IDIR_EGLIBC)/etc
${INSTALL_DATA} ${STAGING_TARGET_DIR}/etc/gai.conf ${IDIR_EGLIBC}/etc
- ${INSTALL_DATA} ./files/nssswitch.conf ${IDIR_EGLIBC}/etc
+ ${INSTALL_DATA} ./files/nsswitch.conf ${IDIR_EGLIBC}/etc
eglibc-static-install:
${INSTALL_DIR} $(IDIR_EGLIBC_STATIC)/usr/lib