change .a libraries to .so in llvm-config37

PR:		205103
Submitted by:	kwm
Obtained from:	https://bugs.gentoo.org/show_bug.cgi?id=565358
This commit is contained in:
Brooks Davis 2015-12-22 21:35:30 +00:00
parent 01ecff9c21
commit d0d8477b93
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=404268
3 changed files with 36 additions and 4 deletions

View file

@ -2,7 +2,7 @@
PORTNAME= llvm
DISTVERSION= 3.7.0
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= devel lang
MASTER_SITES= http://llvm.org/${PRE_}releases/${LLVM_RELEASE}/${RCDIR}
DISTNAME= ${PORTNAME}-${DISTVERSION}.src

View file

@ -0,0 +1,14 @@
--- tools/llvm-config/llvm-config.cpp.orig 2015-12-21 11:12:59.047349000 +0100
+++ tools/llvm-config/llvm-config.cpp 2015-12-21 11:14:08.881815000 +0100
@@ -360,8 +360,9 @@ int main(int argc, char **argv) {
OS << ActiveLibDir << '/' << Lib;
} else if (PrintLibs) {
// If this is a typical library name, include it using -l.
- if (Lib.startswith("lib") && Lib.endswith(".a")) {
- OS << "-l" << Lib.slice(3, Lib.size()-2);
+ if (Lib.startswith("lib") && Lib.endswith(LTDL_SHLIB_EXT)) {
+ // sizeof counts trailing NULL
+ OS << "-l" << Lib.slice(3, Lib.size()-sizeof(LTDL_SHLIB_EXT)+1);
continue;
}

View file

@ -1,6 +1,24 @@
--- utils/llvm-build/llvmbuild/main.py.orig 2015-07-20 23:51:12 UTC
+++ utils/llvm-build/llvmbuild/main.py
@@ -718,7 +718,17 @@ def add_magic_target_components(parser,
--- utils/llvm-build/llvmbuild/main.py.orig 2014-11-19 04:34:20.000000000 +0100
+++ utils/llvm-build/llvmbuild/main.py 2015-12-21 11:15:34.356019000 +0100
@@ -393,6 +393,8 @@ subdirectories = %s
//
//===----------------------------------------------------------------------===//
+#include "llvm/Config/config.h"
+
""")
f.write('struct AvailableComponent {\n')
f.write(' /// The name of the component.\n')
@@ -413,7 +415,7 @@ subdirectories = %s
if library_name is None:
library_name_as_cstr = '0'
else:
- library_name_as_cstr = '"lib%s.a"' % library_name
+ library_name_as_cstr = '"lib%s" LTDL_SHLIB_EXT' % library_name
f.write(' { "%s", %s, %d, { %s } },\n' % (
name, library_name_as_cstr, is_installed,
', '.join('"%s"' % dep
@@ -718,7 +720,17 @@ def add_magic_target_components(parser,
# We handle a few special cases of target names here for historical
# reasons, as these are the names configure currently comes up with.