Attachment 164457 Details for Bug 205103 – change .a libraries to .so in llvm-config37

[patch] change .a libraries to .so in llvm-config37

llvm37-systemlibs.diff (text/plain), 3.37 KB, created by Koop Mast on 2015-12-21 14:46:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Koop Mast

Created: 2015-12-21 14:46:01 UTC

Size: 3.37 KB

patch

obsolete

>Index: devel/llvm37/Makefile
>===================================================================
>--- devel/llvm37/Makefile	(revision 404088)
>+++ devel/llvm37/Makefile	(working copy)
>@@ -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
>Index: devel/llvm37/files/patch-tools_llvm-config_llvm-config.cpp
>===================================================================
>--- devel/llvm37/files/patch-tools_llvm-config_llvm-config.cpp	(nonexistent)
>+++ devel/llvm37/files/patch-tools_llvm-config_llvm-config.cpp	(working copy)
>@@ -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;
>+           }
>+ 
>
>Property changes on: devel/llvm37/files/patch-tools_llvm-config_llvm-config.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/llvm37/files/patch-utils_llvm-build_llvmbuild_main.py
>===================================================================
>--- devel/llvm37/files/patch-utils_llvm-build_llvmbuild_main.py	(revision 404088)
>+++ devel/llvm37/files/patch-utils_llvm-build_llvmbuild_main.py	(working copy)
>@@ -1,7 +1,25 @@
>---- 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.
> -    native_target_name = { 'x86' : 'X86',

Actions: View | Diff

Attachments on bug 205103: 164457