summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-08-19 11:33:13 +0000
committerMichał Górny <mgorny@gentoo.org>2013-08-19 11:33:13 +0000
commit8745d91000bad67cd74eb8d26b38b0cbfd51b85b (patch)
tree902a315aeae9c8e7351bc00647e972f444c1142b /sys-devel/llvm
parentVersion bump. (diff)
downloadgentoo-2-8745d91000bad67cd74eb8d26b38b0cbfd51b85b.tar.gz
gentoo-2-8745d91000bad67cd74eb8d26b38b0cbfd51b85b.tar.bz2
gentoo-2-8745d91000bad67cd74eb8d26b38b0cbfd51b85b.zip
Update the LLVM Gentoo patch for live version.
(Portage version: 2.2.0_p8/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)
Diffstat (limited to 'sys-devel/llvm')
-rw-r--r--sys-devel/llvm/ChangeLog6
-rw-r--r--sys-devel/llvm/files/llvm-3.4-gentoo-install.patch22
2 files changed, 16 insertions, 12 deletions
diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index ede29d78ebc9..97ddf398f80a 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-devel/llvm
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.132 2013/08/14 19:50:28 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.133 2013/08/19 11:33:13 mgorny Exp $
+
+ 19 Aug 2013; Michał Górny <mgorny@gentoo.org>
+ files/llvm-3.4-gentoo-install.patch:
+ Update the LLVM Gentoo patch for live version.
14 Aug 2013; Fabian Groffen <grobian@gentoo.org> llvm-3.3-r1.ebuild,
llvm-9999.ebuild:
diff --git a/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch b/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch
index 6188a0fc7eab..41f5070561f8 100644
--- a/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch
+++ b/sys-devel/llvm/files/llvm-3.4-gentoo-install.patch
@@ -1,6 +1,6 @@
-From 912a22be663bc1c0cc20b9cde9c9a35e9f48275c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <gentoo@mgorny.alt.pl>
-Date: Fri, 19 Jul 2013 10:10:52 +0200
+From f06a30b4412a99c083debf2621c3edb538a6b444 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 19 Aug 2013 13:22:46 +0200
Subject: [PATCH 1/2] gentoo install fixes
---
@@ -32,19 +32,19 @@ index dcca45f..e75ae2e 100644
PROJ_infodir := $(PROJ_prefix)/info
PROJ_mandir := $(PROJ_prefix)/share/man
diff --git a/Makefile.rules b/Makefile.rules
-index 32b1ebc..5bb0342 100644
+index ed7e0e9..d3a18ca 100644
--- a/Makefile.rules
+++ b/Makefile.rules
-@@ -277,7 +277,7 @@ ifeq ($(ENABLE_OPTIMIZED),1)
- ifneq ($(HOST_OS),FreeBSD)
- ifneq ($(HOST_OS),GNU/kFreeBSD)
- ifneq ($(HOST_OS),Darwin)
+@@ -275,7 +275,7 @@ ifeq ($(ENABLE_OPTIMIZED),1)
+ BuildMode := Release
+ # Don't use -fomit-frame-pointer on Darwin or FreeBSD.
+ ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin Darwin FreeBSD GNU/kFreeBSD))
- OmitFramePointer := -fomit-frame-pointer
+ OmitFramePointer :=
endif
- endif
- endif
-@@ -619,11 +619,11 @@ ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
+
+ CXX.Flags += $(OPTIMIZE_OPTION) $(OmitFramePointer)
+@@ -615,11 +615,11 @@ ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))
endif
ifneq ($(HOST_OS), Darwin)
ifdef TOOLNAME