diff options
| author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2012-10-09 00:07:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2012-10-09 00:07:02 +0200 |
| commit | ab873baee4dfea7af585ddbbf314db3a9f3317c0 (patch) | |
| tree | 230f0affc41eec14bc54564c36a779db373d651e | |
| parent | 0b6d38874b6e94807f58ab8b46160ce6faf0ed35 (diff) | |
| parent | 6916a7793d864f5dcb661bb059a4f99afa1ee433 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | mk/image.mk | 4 | ||||
| -rw-r--r-- | package/binutils/Makefile | 6 | ||||
| -rw-r--r-- | toolchain/eglibc/Makefile | 2 | ||||
| -rw-r--r-- | toolchain/glibc/Makefile | 2 |
4 files changed, 12 insertions, 2 deletions
diff --git a/mk/image.mk b/mk/image.mk index 8ce4dbf0b..b432a32ce 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -51,9 +51,13 @@ image-prepare-post: -rm -f ${TARGET_DIR}/bin/sh ln -sf ${BINSH} ${TARGET_DIR}/bin/sh ifeq ($(ADK_TARGET_WITH_MULTILIB),y) + # multilib fixup lib dirs mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH} rm -rf ${TARGET_DIR}/lib/ ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib + mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} + rm -rf ${TARGET_DIR}/usr/lib/ + ln -sf /usr/${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/usr/lib endif KERNEL_PKGDIR:=$(LINUX_BUILD_DIR)/kernel-pkg diff --git a/package/binutils/Makefile b/package/binutils/Makefile index 9bd18ce93..43043514c 100644 --- a/package/binutils/Makefile +++ b/package/binutils/Makefile @@ -19,6 +19,12 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,BINUTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,LIBBFD,libbfd,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LIBBFD},${PKGSC_LIBBFD})) +ifeq ($(ADK_TARGET_WITH_MULTILIB),y) +CONFIGURE_ARGS+= --enable-multilib +else +CONFIGURE_ARGS+= --disable-multilib +endif + TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) TARGET_CFLAGS+= -fPIC ifeq ($(ADK_NATIVE),) diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile index ec648d9af..3529d9124 100644 --- a/toolchain/eglibc/Makefile +++ b/toolchain/eglibc/Makefile @@ -141,7 +141,7 @@ endif $(CP) $(STAGING_TARGET_DIR)-64/lib/* $(STAGING_TARGET_DIR)-64/usr/lib/* \ $(STAGING_TARGET_DIR)/lib/$(REAL_GNU_TARGET_NAME)/4.7.2/; \ rm $(STAGING_TARGET_DIR)/lib/$(REAL_GNU_TARGET_NAME)/4.7.2/libc.so ; \ - -for abi in $(TABI); do \ + for abi in $(TABI); do \ mkdir -p $(STAGING_TARGET_DIR)/lib/$(REAL_GNU_TARGET_NAME)/4.7.2/$${abi/*:/} ; \ $(CP) $(STAGING_TARGET_DIR)-$${abi/*:/}/lib/* $(STAGING_TARGET_DIR)-$${abi/*:/}/usr/lib/* \ $(STAGING_TARGET_DIR)/lib/$(REAL_GNU_TARGET_NAME)/4.7.2/$${abi/*:/} ; \ diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile index fbcbc617a..d6aeb64b2 100644 --- a/toolchain/glibc/Makefile +++ b/toolchain/glibc/Makefile @@ -125,7 +125,7 @@ endif $(CP) $(STAGING_TARGET_DIR)-64/lib/* $(STAGING_TARGET_DIR)-64/usr/lib/* \ $(STAGING_TARGET_DIR)/lib/$(REAL_GNU_TARGET_NAME)/4.7.2/; \ rm $(STAGING_TARGET_DIR)/lib/$(REAL_GNU_TARGET_NAME)/4.7.2/libc.so ; \ - -for abi in $(TABI); do \ + for abi in $(TABI); do \ mkdir -p $(STAGING_TARGET_DIR)/lib/$(REAL_GNU_TARGET_NAME)/4.7.2/$${abi/*:/} ; \ $(CP) $(STAGING_TARGET_DIR)-$${abi/*:/}/lib/* $(STAGING_TARGET_DIR)-$${abi/*:/}/usr/lib/* \ $(STAGING_TARGET_DIR)/lib/$(REAL_GNU_TARGET_NAME)/4.7.2/$${abi/*:/} ; \ |