Date: Tue, 22 Dec 2015 21:35:30 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r404268 - in head/devel/llvm37: . files Message-ID: <201512222135.tBMLZUgT062487@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Tue Dec 22 21:35:30 2015 New Revision: 404268 URL: https://svnweb.freebsd.org/changeset/ports/404268 Log: change .a libraries to .so in llvm-config37 PR: 205103 Submitted by: kwm Obtained from: https://bugs.gentoo.org/show_bug.cgi?id=565358 Added: head/devel/llvm37/files/patch-tools_llvm-config_llvm-config.cpp (contents, props changed) Modified: head/devel/llvm37/Makefile head/devel/llvm37/files/patch-utils_llvm-build_llvmbuild_main.py Modified: head/devel/llvm37/Makefile ============================================================================== --- head/devel/llvm37/Makefile Tue Dec 22 21:21:51 2015 (r404267) +++ head/devel/llvm37/Makefile Tue Dec 22 21:35:30 2015 (r404268) @@ -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 Added: head/devel/llvm37/files/patch-tools_llvm-config_llvm-config.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/llvm37/files/patch-tools_llvm-config_llvm-config.cpp Tue Dec 22 21:35:30 2015 (r404268) @@ -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; + } + Modified: head/devel/llvm37/files/patch-utils_llvm-build_llvmbuild_main.py ============================================================================== --- head/devel/llvm37/files/patch-utils_llvm-build_llvmbuild_main.py Tue Dec 22 21:21:51 2015 (r404267) +++ head/devel/llvm37/files/patch-utils_llvm-build_llvmbuild_main.py Tue Dec 22 21:35:30 2015 (r404268) @@ -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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512222135.tBMLZUgT062487>