* [gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/9999/
@ 2016-08-31 21:11 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2016-08-31 21:11 UTC (permalink / raw
To: gentoo-commits
commit: 99e47f0307cf265b96d7a428b443d98f50e789cf
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 31 15:54:20 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 21:11:25 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99e47f03
sys-devel/llvm: Fix llvm-config --obj-root on the live ebuild
...-Clean-up-exported-values-update-for-shar.patch | 25 ++++++++--------------
1 file changed, 9 insertions(+), 16 deletions(-)
diff --git a/sys-devel/llvm/files/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch b/sys-devel/llvm/files/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
index 968db45..0ae66bd 100644
--- a/sys-devel/llvm/files/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
+++ b/sys-devel/llvm/files/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
@@ -1,14 +1,14 @@
-From 2dba8c81db58d7dd62c67379eaa175498a4370f2 Mon Sep 17 00:00:00 2001
+From df2ea14b7c07dd7cf3e33f2e66f36af8af3b425e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Sat, 20 Aug 2016 23:47:41 +0200
-Subject: [PATCH 07/10] llvm-config: Clean up exported values, update for
- shared linking
+Subject: [PATCH 6/9] 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,
-- making --obj-root and --src-root return invalid path (/dev/null),
+- making --src-root return invalid path (/dev/null),
- making --build-mode return "Release" rather than "Gentoo".
Thanks to Steven Newbury for the initial patch.
@@ -17,8 +17,8 @@ Bug: https://bugs.gentoo.org/565358
Bug: https://bugs.gentoo.org/501684
---
tools/llvm-config/CMakeLists.txt | 11 ++++++++---
- tools/llvm-config/llvm-config.cpp | 15 ++++++++++++---
- 2 files changed, 20 insertions(+), 6 deletions(-)
+ tools/llvm-config/llvm-config.cpp | 9 +++++++--
+ 2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt
index 744fa4e..593788a 100644
@@ -50,7 +50,7 @@ index 744fa4e..593788a 100644
set(LLVM_ENABLE_SHARED ON)
else()
diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp
-index c63733f..ead11b9 100644
+index c63733f..3162091 100644
--- a/tools/llvm-config/llvm-config.cpp
+++ b/tools/llvm-config/llvm-config.cpp
@@ -522,7 +522,8 @@ int main(int argc, char **argv) {
@@ -63,16 +63,9 @@ index c63733f..ead11b9 100644
} else if (Arg == "--assertion-mode") {
#if defined(NDEBUG)
OS << "OFF\n";
-@@ -538,9 +539,17 @@ int main(int argc, char **argv) {
- } else if (Arg == "--shared-mode") {
- PrintSharedMode = true;
+@@ -540,7 +541,11 @@ int main(int argc, char **argv) {
} else if (Arg == "--obj-root") {
-- OS << ActivePrefix << '\n';
-+ if (IsInDevelopmentTree) {
-+ OS << ActivePrefix << '\n';
-+ } else {
-+ OS << "/dev/null\n";
-+ }
+ OS << ActivePrefix << '\n';
} else if (Arg == "--src-root") {
- OS << LLVM_SRC_ROOT << '\n';
+ if (IsInDevelopmentTree) {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/9999/
@ 2016-12-14 22:13 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2016-12-14 22:13 UTC (permalink / raw
To: gentoo-commits
commit: 156b9ad0a4e9f225e8c5ea36fa6bf740d2e1c60a
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 14 22:05:25 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec 14 22:13:16 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=156b9ad0
sys-devel/llvm: Rebase the llvm-config patch for -9999
...ig-Clean-up-exported-values-update-for-shar.patch | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/sys-devel/llvm/files/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch b/sys-devel/llvm/files/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
index 0ae66bd..5a5bb0a 100644
--- a/sys-devel/llvm/files/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
+++ b/sys-devel/llvm/files/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
@@ -1,7 +1,7 @@
-From df2ea14b7c07dd7cf3e33f2e66f36af8af3b425e Mon Sep 17 00:00:00 2001
+From 628b899be14a6bab4b32dbd53aabd447dcc16cb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Sat, 20 Aug 2016 23:47:41 +0200
-Subject: [PATCH 6/9] llvm-config: Clean up exported values, update for shared
+Subject: [PATCH] llvm-config: Clean up exported values, update for shared
linking
Gentoo-specific fixup for llvm-config, including:
@@ -21,7 +21,7 @@ Bug: https://bugs.gentoo.org/501684
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt
-index 744fa4e..593788a 100644
+index 744fa4e44d1..593788aaef3 100644
--- a/tools/llvm-config/CMakeLists.txt
+++ b/tools/llvm-config/CMakeLists.txt
@@ -32,8 +32,12 @@ get_property(COMPILE_FLAGS TARGET llvm-config PROPERTY COMPILE_FLAGS)
@@ -50,10 +50,10 @@ index 744fa4e..593788a 100644
set(LLVM_ENABLE_SHARED ON)
else()
diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp
-index c63733f..3162091 100644
+index d780094861c..c61c72ff48c 100644
--- a/tools/llvm-config/llvm-config.cpp
+++ b/tools/llvm-config/llvm-config.cpp
-@@ -522,7 +522,8 @@ int main(int argc, char **argv) {
+@@ -531,7 +531,8 @@ int main(int argc, char **argv) {
} else if (Arg == "--host-target") {
OS << Triple::normalize(LLVM_DEFAULT_TARGET_TRIPLE) << '\n';
} else if (Arg == "--build-mode") {
@@ -63,7 +63,7 @@ index c63733f..3162091 100644
} else if (Arg == "--assertion-mode") {
#if defined(NDEBUG)
OS << "OFF\n";
-@@ -540,7 +541,11 @@ int main(int argc, char **argv) {
+@@ -549,7 +550,11 @@ int main(int argc, char **argv) {
} else if (Arg == "--obj-root") {
OS << ActivePrefix << '\n';
} else if (Arg == "--src-root") {
@@ -73,9 +73,9 @@ index c63733f..3162091 100644
+ } else {
+ OS << "/dev/null\n";
+ }
- } else if (Arg == "--link-shared") {
- LinkMode = LinkModeShared;
- } else if (Arg == "--link-static") {
+ } else if (Arg == "--ignore-libllvm") {
+ LinkDyLib = false;
+ LinkMode = BuiltSharedLibs ? LinkModeShared : LinkModeAuto;
--
-2.9.3
+2.11.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/9999/
@ 2017-01-11 19:12 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2017-01-11 19:12 UTC (permalink / raw
To: gentoo-commits
commit: 7bb6bfaffcd296db204e5ffc686d5cad1c0d5262
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 11 17:09:55 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jan 11 19:12:41 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bb6bfaf
sys-devel/llvm: Update llvm-config patch for -9999
Remove the system-libs bits from the llvm-config patch since they are no
longer necessary now that 'llvm-config --system-libs' does not output
any libraries when using shared linking.
...llvm-config-Clean-up-exported-values-update-for-shar.patch | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/sys-devel/llvm/files/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch b/sys-devel/llvm/files/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
index 5a5bb0a..3221304 100644
--- a/sys-devel/llvm/files/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
+++ b/sys-devel/llvm/files/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
@@ -7,7 +7,6 @@ Subject: [PATCH] llvm-config: Clean up exported values, update for shared
Gentoo-specific fixup for llvm-config, including:
- wiping build-specific CFLAGS, CXXFLAGS,
- updating library suffixes for shared libs,
-- wiping --system-libs for shared linking,
- making --src-root return invalid path (/dev/null),
- making --build-mode return "Release" rather than "Gentoo".
@@ -39,16 +38,6 @@ index 744fa4e44d1..593788aaef3 100644
set(LLVM_BUILD_SYSTEM cmake)
set(LLVM_HAS_RTTI ${LLVM_CONFIG_HAS_RTTI})
set(LLVM_DYLIB_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}${LLVM_VERSION_SUFFIX}")
-@@ -46,7 +50,8 @@ endif()
- # Use the C++ link flags, since they should be a superset of C link flags.
- set(LLVM_LDFLAGS "${CMAKE_CXX_LINK_FLAGS}")
- set(LLVM_BUILDMODE ${CMAKE_BUILD_TYPE})
--set(LLVM_SYSTEM_LIBS ${SYSTEM_LIBS})
-+# We don't do static libs, so we don't need to supply any system-libs
-+set(LLVM_SYSTEM_LIBS "")
- if(BUILD_SHARED_LIBS)
- set(LLVM_ENABLE_SHARED ON)
- else()
diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp
index d780094861c..c61c72ff48c 100644
--- a/tools/llvm-config/llvm-config.cpp
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/9999/
@ 2017-02-11 12:07 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2017-02-11 12:07 UTC (permalink / raw
To: gentoo-commits
commit: 64f076a7aa3f7387f827d898481d8fff856bd370
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 11 11:53:50 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 12:07:27 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64f076a7
sys-devel/llvm: Remove CMAKE_BUILD_TYPE hack from llvm-config in 4.0+
...nfig-Clean-up-exported-values-update-for-shar.patch | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
diff --git a/sys-devel/llvm/files/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch b/sys-devel/llvm/files/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
index 32213040a8..5def55d38f 100644
--- a/sys-devel/llvm/files/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
+++ b/sys-devel/llvm/files/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
@@ -6,18 +6,12 @@ Subject: [PATCH] llvm-config: Clean up exported values, update for shared
Gentoo-specific fixup for llvm-config, including:
- wiping build-specific CFLAGS, CXXFLAGS,
-- updating library suffixes for shared libs,
-- making --src-root return invalid path (/dev/null),
-- making --build-mode return "Release" rather than "Gentoo".
+- making --src-root return invalid path (/dev/null).
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 | 11 ++++++++---
- tools/llvm-config/llvm-config.cpp | 9 +++++++--
- 2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/tools/llvm-config/CMakeLists.txt b/tools/llvm-config/CMakeLists.txt
index 744fa4e44d1..593788aaef3 100644
@@ -42,16 +36,6 @@ diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.c
index d780094861c..c61c72ff48c 100644
--- a/tools/llvm-config/llvm-config.cpp
+++ b/tools/llvm-config/llvm-config.cpp
-@@ -531,7 +531,8 @@ int main(int argc, char **argv) {
- } else if (Arg == "--host-target") {
- OS << Triple::normalize(LLVM_DEFAULT_TARGET_TRIPLE) << '\n';
- } else if (Arg == "--build-mode") {
-- OS << build_mode << '\n';
-+ // force Release since we force non-standard Gentoo build mode
-+ OS << "Release" << '\n';
- } else if (Arg == "--assertion-mode") {
- #if defined(NDEBUG)
- OS << "OFF\n";
@@ -549,7 +550,11 @@ int main(int argc, char **argv) {
} else if (Arg == "--obj-root") {
OS << ActivePrefix << '\n';
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/9999/
@ 2021-04-22 10:00 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2021-04-22 10:00 UTC (permalink / raw
To: gentoo-commits
commit: c272e3cd4f02c3b2d4a2073cabdc3e78d6a0d61e
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 22 09:49:58 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Apr 22 09:49:58 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c272e3cd
sys-devel/llvm: Remove stale musl patch
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-devel/llvm/files/9999/musl-fixes.patch | 33 ------------------------------
1 file changed, 33 deletions(-)
diff --git a/sys-devel/llvm/files/9999/musl-fixes.patch b/sys-devel/llvm/files/9999/musl-fixes.patch
deleted file mode 100644
index 5c516534abc..00000000000
--- a/sys-devel/llvm/files/9999/musl-fixes.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/include/llvm/Analysis/TargetLibraryInfo.def b/include/llvm/Analysis/TargetLibraryInfo.def
-index 7798e3c..ade2b96 100644
---- a/include/llvm/Analysis/TargetLibraryInfo.def
-+++ b/include/llvm/Analysis/TargetLibraryInfo.def
-@@ -27,6 +27,15 @@
- #define TLI_DEFINE_STRING_INTERNAL(string_repr) string_repr,
- #endif
-
-+// avoid name conflicts with musl-libc
-+#undef fopen64
-+#undef fseeko64
-+#undef ftello64
-+#undef fstat64
-+#undef lstat64
-+#undef stat64
-+#undef tmpfile64
-+
- /// void *new(unsigned int);
- TLI_DEFINE_ENUM_INTERNAL(msvc_new_int)
- TLI_DEFINE_STRING_INTERNAL("??2@YAPAXI@Z")
-diff --git a/lib/Support/DynamicLibrary.cpp b/lib/Support/DynamicLibrary.cpp
-index 9a7aeb5..e98ad80 100644
---- a/lib/Support/DynamicLibrary.cpp
-+++ b/lib/Support/DynamicLibrary.cpp
-@@ -143,7 +143,7 @@ void* DynamicLibrary::SearchForAddressOfSymbol(const char *symbolName) {
- // On linux we have a weird situation. The stderr/out/in symbols are both
- // macros and global variables because of standards requirements. So, we
- // boldly use the EXPLICIT_SYMBOL macro without checking for a #define first.
--#if defined(__linux__) and !defined(__ANDROID__)
-+#if defined(__linux__) && defined(__GLIBC__)
- {
- EXPLICIT_SYMBOL(stderr);
- EXPLICIT_SYMBOL(stdout);
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-04-22 10:00 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-11 12:07 [gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/9999/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2021-04-22 10:00 Michał Górny
2017-01-11 19:12 Michał Górny
2016-12-14 22:13 Michał Górny
2016-08-31 21:11 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox