summaryrefslogtreecommitdiff
path: root/package/musl
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-09-04 09:31:59 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2013-09-04 09:31:59 (GMT)
commita83ed8ee2e2b2969aea2f9f01214575ba9dfc6b9 (patch)
treee906d6651a576d2960a712a618e9540ccced3f17 /package/musl
parent7f8f6fdab78a2f650fbce3725a17325e83768484 (diff)
fix musl package for x86 arch
Diffstat (limited to 'package/musl')
-rw-r--r--package/musl/Makefile18
1 files changed, 15 insertions, 3 deletions
diff --git a/package/musl/Makefile b/package/musl/Makefile
index 4bf8705..e752657 100644
--- a/package/musl/Makefile
+++ b/package/musl/Makefile
@@ -23,15 +23,26 @@ CONFIG_STYLE:= manual
BUILD_STYLE:= manual
INSTALL_STYLE:= manual
+MARCH:= $(CPU_ARCH)
+ifeq ($(CPU_ARCH),i686)
+MARCH:= i386
+endif
+ifeq ($(CPU_ARCH),i586)
+MARCH:= i386
+endif
+ifeq ($(CPU_ARCH),i486)
+MARCH:= i386
+endif
+
# do nothing, musl is already build in toolchain directory
do-install:
${INSTALL_DIR} $(IDIR_MUSL)/usr/bin
${INSTALL_DIR} $(IDIR_MUSL)/$(ADK_TARGET_LIBC_PATH)
$(CP) $(STAGING_TARGET_DIR)/usr/lib/libc.so $(IDIR_MUSL)/$(ADK_TARGET_LIBC_PATH)
(cd $(IDIR_MUSL)/$(ADK_TARGET_LIBC_PATH) && \
- ln -sf libc.so ld-musl-$(CPU_ARCH).so.1)
+ ln -sf libc.so ld-musl-$(MARCH).so.1)
(cd $(IDIR_MUSL)/usr/bin && \
- ln -sf ../../lib/ld-musl-$(CPU_ARCH).so.1 ldd)
+ ln -sf ../../lib/ld-musl-$(MARCH).so.1 ldd)
musl-dev-install:
@@ -41,7 +52,8 @@ musl-dev-install:
INSTALL_HDR_PATH=$(IDIR_MUSL_DEV)/usr \
headers_install
$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION} \
- install_headers
+ DESTDIR=$(IDIR_MUSL_DEV) \
+ install-headers
@find $(IDIR_MUSL_DEV) -name .install -exec rm {} \;
@find $(IDIR_MUSL_DEV) -name ..install.cmd -exec rm {} \;