Attachment #164457 for bug #205103

View | Details | Raw Unified | Return to bug 205103
Collapse All | Expand All

Lines 2-8 Link Here

(-)devel/llvm37/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= llvm	3	PORTNAME= llvm
4	DISTVERSION= 3.7.0	4	DISTVERSION= 3.7.0
5	PORTREVISION= 5	5	PORTREVISION= 6
6	CATEGORIES= devel lang	6	CATEGORIES= devel lang
7	MASTER_SITES= http://llvm.org/${PRE_}releases/${LLVM_RELEASE}/${RCDIR}	7	MASTER_SITES= http://llvm.org/${PRE_}releases/${LLVM_RELEASE}/${RCDIR}
8	DISTNAME= ${PORTNAME}-${DISTVERSION}.src	8	DISTNAME= ${PORTNAME}-${DISTVERSION}.src




--- 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;
           }
 

Lines 1-7 Link Here

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

Return to bug 205103

Line 0 Link Here

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