Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 572564 - sys-devel/llvm-9999 llvm-config patch broken
Summary: sys-devel/llvm-9999 llvm-config patch broken
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: [OLD] Development (show other bugs)
Hardware: AMD64 Linux
: Normal normal (vote)
Assignee: Bernard Cafarelli
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2016-01-22 04:32 UTC by Chase Rayfield
Modified: 2016-01-25 15:28 UTC (History)
2 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Chase Rayfield 2016-01-22 04:32:01 UTC
there was mention of fixing this upsteam gentoo could drop this patch... maybe that has happened?

https://bugs.gentoo.org/show_bug.cgi?id=565358


Reproducible: Always

Steps to Reproduce:
1. Emerge llvm-9999

Actual Results:  
***** llvm-3.8-llvm-config.patch *****
PWD: /var/tmp/portage/sys-devel/llvm-9999/work/llvm-9999
PATCH TOOL: patch -> /usr/bin/patch
VERSION INFO:
GNU patch 2.7.5
Copyright (C) 2003, 2009-2012 Free Software Foundation, Inc.
Copyright (C) 1988 Larry Wall

License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.

Written by Larry Wall and Paul Eggert

======================================

PATCH COMMAND:  patch -p0 -g0 -E --no-backup-if-mismatch  --dry-run -f < '/usr/portage/sys-devel/llvm/files/llvm-3.8-llvm-config.patch'

======================================
can't find file to patch at input line 27
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|From cc0ac62d1c03206bc3a1edba4d60f97921b854f5 Mon Sep 17 00:00:00 2001
|From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
|Date: Fri, 4 Dec 2015 20:45:33 +0100
|Subject: [PATCH] llvm-config: Clean up exported values, update for shared
| linking
|
|Gentoo-specific fixup for llvm-config, including:
|- wiping build-specific CFLAGS, CXXFLAGS,
|- updating library suffixes for shared libs,
|- wiping --system-libs for shared linking,
|- banning --obj-root and --src-root due to no sources installed.
|
|Thanks to Steven Newbury for the initial patch.
|
|Bug: https://bugs.gentoo.org/565358
|Bug: https://bugs.gentoo.org/501684
|---
| tools/llvm-config/CMakeLists.txt   |  9 +++++++--
| tools/llvm-config/llvm-config.cpp  | 17 +++++++++++++----
| utils/llvm-build/llvmbuild/main.py |  5 ++++-
| 3 files changed, 24 insertions(+), 7 deletions(-)
|
|diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt
|index 83794bb..21fd845 100644
|--- a/tools/llvm-config/CMakeLists.txt
|+++ b/tools/llvm-config/CMakeLists.txt
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 54
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp
|index 80f6279..b16b9a3 100644
|--- a/tools/llvm-config/llvm-config.cpp
|+++ b/tools/llvm-config/llvm-config.cpp
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 82
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/utils/llvm-build/llvmbuild/main.py b/utils/llvm-build/llvmbuild/main.py
|index f2472f6..a29fc83 100644
|--- a/utils/llvm-build/llvmbuild/main.py
|+++ b/utils/llvm-build/llvmbuild/main.py
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored

patch program exited with status 1
======================================

PATCH COMMAND:  patch -p1 -g0 -E --no-backup-if-mismatch  --dry-run -f < '/usr/portage/sys-devel/llvm/files/llvm-3.8-llvm-config.patch'

======================================
checking file tools/llvm-config/CMakeLists.txt
Hunk #1 FAILED at 22.
1 out of 1 hunk FAILED
checking file tools/llvm-config/llvm-config.cpp
Hunk #1 FAILED at 497.
1 out of 1 hunk FAILED
checking file utils/llvm-build/llvmbuild/main.py

patch program exited with status 1
======================================

PATCH COMMAND:  patch -p2 -g0 -E --no-backup-if-mismatch  --dry-run -f < '/usr/portage/sys-devel/llvm/files/llvm-3.8-llvm-config.patch'

======================================
can't find file to patch at input line 27
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|From cc0ac62d1c03206bc3a1edba4d60f97921b854f5 Mon Sep 17 00:00:00 2001
|From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
|Date: Fri, 4 Dec 2015 20:45:33 +0100
|Subject: [PATCH] llvm-config: Clean up exported values, update for shared
| linking
|
|Gentoo-specific fixup for llvm-config, including:
|- wiping build-specific CFLAGS, CXXFLAGS,
|- updating library suffixes for shared libs,
|- wiping --system-libs for shared linking,
|- banning --obj-root and --src-root due to no sources installed.
|
|Thanks to Steven Newbury for the initial patch.
|
|Bug: https://bugs.gentoo.org/565358
|Bug: https://bugs.gentoo.org/501684
|---
| tools/llvm-config/CMakeLists.txt   |  9 +++++++--
| tools/llvm-config/llvm-config.cpp  | 17 +++++++++++++----
| utils/llvm-build/llvmbuild/main.py |  5 ++++-
| 3 files changed, 24 insertions(+), 7 deletions(-)
|
|diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt
|index 83794bb..21fd845 100644
|--- a/tools/llvm-config/CMakeLists.txt
|+++ b/tools/llvm-config/CMakeLists.txt
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 54
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp
|index 80f6279..b16b9a3 100644
|--- a/tools/llvm-config/llvm-config.cpp
|+++ b/tools/llvm-config/llvm-config.cpp
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 82
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/utils/llvm-build/llvmbuild/main.py b/utils/llvm-build/llvmbuild/main.py
|index f2472f6..a29fc83 100644
|--- a/utils/llvm-build/llvmbuild/main.py
|+++ b/utils/llvm-build/llvmbuild/main.py
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored

patch program exited with status 1
======================================

PATCH COMMAND:  patch -p3 -g0 -E --no-backup-if-mismatch  --dry-run -f < '/usr/portage/sys-devel/llvm/files/llvm-3.8-llvm-config.patch'

======================================
checking file CMakeLists.txt
Hunk #1 FAILED at 22.
1 out of 1 hunk FAILED
can't find file to patch at input line 54
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp
|index 80f6279..b16b9a3 100644
|--- a/tools/llvm-config/llvm-config.cpp
|+++ b/tools/llvm-config/llvm-config.cpp
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 82
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/utils/llvm-build/llvmbuild/main.py b/utils/llvm-build/llvmbuild/main.py
|index f2472f6..a29fc83 100644
|--- a/utils/llvm-build/llvmbuild/main.py
|+++ b/utils/llvm-build/llvmbuild/main.py
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored

patch program exited with status 1
======================================

PATCH COMMAND:  patch -p4 -g0 -E --no-backup-if-mismatch  --dry-run -f < '/usr/portage/sys-devel/llvm/files/llvm-3.8-llvm-config.patch'

======================================
can't find file to patch at input line 27
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|From cc0ac62d1c03206bc3a1edba4d60f97921b854f5 Mon Sep 17 00:00:00 2001
|From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
|Date: Fri, 4 Dec 2015 20:45:33 +0100
|Subject: [PATCH] llvm-config: Clean up exported values, update for shared
| linking
|
|Gentoo-specific fixup for llvm-config, including:
|- wiping build-specific CFLAGS, CXXFLAGS,
|- updating library suffixes for shared libs,
|- wiping --system-libs for shared linking,
|- banning --obj-root and --src-root due to no sources installed.
|
|Thanks to Steven Newbury for the initial patch.
|
|Bug: https://bugs.gentoo.org/565358
|Bug: https://bugs.gentoo.org/501684
|---
| tools/llvm-config/CMakeLists.txt   |  9 +++++++--
| tools/llvm-config/llvm-config.cpp  | 17 +++++++++++++----
| utils/llvm-build/llvmbuild/main.py |  5 ++++-
| 3 files changed, 24 insertions(+), 7 deletions(-)
|
|diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt
|index 83794bb..21fd845 100644
|--- a/tools/llvm-config/CMakeLists.txt
|+++ b/tools/llvm-config/CMakeLists.txt
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 54
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp
|index 80f6279..b16b9a3 100644
|--- a/tools/llvm-config/llvm-config.cpp
|+++ b/tools/llvm-config/llvm-config.cpp
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 82
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/utils/llvm-build/llvmbuild/main.py b/utils/llvm-build/llvmbuild/main.py
|index f2472f6..a29fc83 100644
|--- a/utils/llvm-build/llvmbuild/main.py
|+++ b/utils/llvm-build/llvmbuild/main.py
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored

patch program exited with status 1
Comment 1 Bernard Cafarelli gentoo-dev 2016-01-25 14:02:29 UTC
Yes, the patch needs an update for > 3.8 (we had an early warning in #571196). I'm waiting for the compilation result after patch update
Comment 2 Bernard Cafarelli gentoo-dev 2016-01-25 15:28:52 UTC
Patch updated for trunk/3.9, it should be OK on your next sync.