summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2014-10-31 01:55:04 +0000
committerMike Frysinger <vapier@gentoo.org>2014-10-31 01:55:04 +0000
commite387fd45c181c3668b2846d20314f966e5bccd42 (patch)
tree16ba6261755295ee246a37f6057d910b329b0638 /sys-libs
parentVersion bump. (diff)
downloadgentoo-2-e387fd45c181c3668b2846d20314f966e5bccd42.tar.gz
gentoo-2-e387fd45c181c3668b2846d20314f966e5bccd42.tar.bz2
gentoo-2-e387fd45c181c3668b2846d20314f966e5bccd42.zip
Add DESTDIR fix from upstream for msp430.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/newlib/ChangeLog6
-rw-r--r--sys-libs/newlib/files/newlib-2.1.0-msp430-destdir.patch41
-rw-r--r--sys-libs/newlib/newlib-2.1.0.ebuild3
3 files changed, 48 insertions, 2 deletions
diff --git a/sys-libs/newlib/ChangeLog b/sys-libs/newlib/ChangeLog
index 4eeb1cd8b696..8f8a0957840d 100644
--- a/sys-libs/newlib/ChangeLog
+++ b/sys-libs/newlib/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-libs/newlib
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/newlib/ChangeLog,v 1.25 2014/01/02 12:57:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/newlib/ChangeLog,v 1.26 2014/10/31 01:55:04 vapier Exp $
+
+ 31 Oct 2014; Mike Frysinger <vapier@gentoo.org>
+ +files/newlib-2.1.0-msp430-destdir.patch, newlib-2.1.0.ebuild:
+ Add DESTDIR fix from upstream for msp430.
02 Jan 2014; Mike Frysinger <vapier@gentoo.org> newlib-2.1.0.ebuild,
newlib-9999.ebuild:
diff --git a/sys-libs/newlib/files/newlib-2.1.0-msp430-destdir.patch b/sys-libs/newlib/files/newlib-2.1.0-msp430-destdir.patch
new file mode 100644
index 000000000000..38fa2643dce3
--- /dev/null
+++ b/sys-libs/newlib/files/newlib-2.1.0-msp430-destdir.patch
@@ -0,0 +1,41 @@
+From 0a7009c61811b4451ff6cccda24f42ab07142603 Mon Sep 17 00:00:00 2001
+From: DJ Delorie <dj@redhat.com>
+Date: Thu, 23 Oct 2014 01:49:45 +0000
+Subject: [PATCH] 2014-10-22 Tim Harder <radhermit@gmail.com> *
+ msp430/Makefile.in: respect DESTDIR during install
+
+---
+ libgloss/ChangeLog | 4 ++++
+ libgloss/msp430/Makefile.in | 6 ++++--
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+2014-10-22 Tim Harder <radhermit@gmail.com>
+
+ * msp430/Makefile.in: respect DESTDIR during install
+
+diff --git a/libgloss/msp430/Makefile.in b/libgloss/msp430/Makefile.in
+index d72051d..b9f5a6a 100644
+--- a/libgloss/msp430/Makefile.in
++++ b/libgloss/msp430/Makefile.in
+@@ -12,6 +12,7 @@
+
+ # Makefile for libgloss/msp430.
+
++DESTDIR =
+ VPATH = @srcdir@
+ srcdir = @srcdir@
+ objdir = .
+@@ -138,11 +139,11 @@
+
+ install: $(CRT) $(SIM_BSP) $(LIBNOSYS) $(LIB_CRT) $(SCRIPTS)
+ for c in $(CRT) $(SIM_BSP) $(LIBNOSYS) $(LIB_CRT); do \
+- $(INSTALL_DATA) $$c $(tooldir)/lib${MULTISUBDIR}/$$c ;\
++ $(INSTALL_DATA) $$c $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$$c ;\
+ done
+ for c in $(SCRIPTS); do \
+ b=`basename $$c`; \
+- $(INSTALL_DATA) $$c $(tooldir)/lib${MULTISUBDIR}/$$b ;\
++ $(INSTALL_DATA) $$c $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$$b ;\
+ done
+
+ clean mostlyclean:
diff --git a/sys-libs/newlib/newlib-2.1.0.ebuild b/sys-libs/newlib/newlib-2.1.0.ebuild
index 30e533844d4b..b8ed3d0b3f63 100644
--- a/sys-libs/newlib/newlib-2.1.0.ebuild
+++ b/sys-libs/newlib/newlib-2.1.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/newlib/newlib-2.1.0.ebuild,v 1.2 2014/01/02 12:57:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/newlib/newlib-2.1.0.ebuild,v 1.3 2014/10/31 01:55:04 vapier Exp $
EAPI="4"
@@ -37,6 +37,7 @@ pkg_setup() {
}
src_prepare() {
+ epatch "${FILESDIR}"/${P}-msp430-destdir.patch
epatch_user
}