summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-05-31 11:43:10 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-05-31 11:43:52 +0200
commitb0b05ceb8e0a92c2eda3a98fa7e25eb5929a1ea4 (patch)
tree908239553de00dad29612f354c4e08bd152d98a1
parentb7987c21aead55263d6740cb7204e20478330211 (diff)
do not install libiberty in staging area
-rw-r--r--package/binutils/Makefile1
-rw-r--r--package/gcc/Makefile3
-rw-r--r--package/gdb/Makefile4
-rw-r--r--toolchain/binutils/Makefile1
-rw-r--r--toolchain/gcc/Makefile1
5 files changed, 7 insertions, 3 deletions
diff --git a/package/binutils/Makefile b/package/binutils/Makefile
index 874304806..a0f459b95 100644
--- a/package/binutils/Makefile
+++ b/package/binutils/Makefile
@@ -33,6 +33,7 @@ endif
TARGET_CFLAGS+= -fPIC
CONFIGURE_ARGS+= --disable-werror \
+ --disable-install-libiberty \
--host=$(GNU_TARGET_NAME) \
--target=$(GNU_TARGET_NAME)
# disable honour cflags stuff
diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index 1b8104658..bef430d12 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -66,7 +66,7 @@ CONFIGURE_ARGS+= --host=$(GNU_TARGET_NAME) \
--disable-libstdcxx-pch \
--disable-libsanitizer \
--disable-libitm \
- --enable-install-libiberty \
+ --disable-install-libiberty \
--enable-cxx-flags="${TARGET_LDFLAGS}"
# disable honour cflags stuff
@@ -74,6 +74,7 @@ XAKE_FLAGS+= GCC_HONOUR_COPTS=s
pre-configure:
$(SED) 's@\./fixinc\.sh@-c true@' $(WRKSRC)/gcc/Makefile.in
+ $(SED) 's/install_to_$$(INSTALL_DEST) //' ${WRKSRC}/libiberty/Makefile.in
gcc-install:
${INSTALL_DIR} ${IDIR_GCC}/usr/lib/gcc ${IDIR_GCC}/usr/bin
diff --git a/package/gdb/Makefile b/package/gdb/Makefile
index a69cc580c..908f87b65 100644
--- a/package/gdb/Makefile
+++ b/package/gdb/Makefile
@@ -26,6 +26,8 @@ CONFIGURE_ARGS+= --without-uiout \
--without-python \
--without-included-gettext \
--without-auto-load-safe-path \
+ --disable-install-libiberty \
+ --disable-install-libbfd \
--with-curses \
--enable-gdbmi
@@ -36,7 +38,5 @@ XAKE_FLAGS+= GCC_HONOUR_COPTS:=s
gdb-install:
${INSTALL_DIR} ${IDIR_GDB}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/gdb ${IDIR_GDB}/usr/bin/
- # shipped libbfd conflicts with system wide one
- rm -f ${WRKINST}/usr/lib/libbfd*
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile
index 49549f625..80565bc17 100644
--- a/toolchain/binutils/Makefile
+++ b/toolchain/binutils/Makefile
@@ -49,6 +49,7 @@ $(WRKBUILD)/.configured:
--disable-libtool-lock \
--disable-nls \
--disable-werror \
+ --disable-install-libiberty \
${CONFOPTS} \
);
touch $@
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 198b9b4ec..36fd30deb 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -21,6 +21,7 @@ GCC_CONFOPTS:= --prefix=$(TOOLCHAIN_DIR)/usr \
--with-gnu-as \
--enable-tls \
--disable-libsanitizer \
+ --disable-install-libiberty \
--disable-libitm \
--disable-libmudflap \
--disable-libgomp \