pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

compiler-rt-netbsd: Update to SVN r. 325315



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Fri Feb 16 05:32:23 2018 +0100
Changeset:	43ac3b96042ee9add7301efbc578ea021974cf9f

Modified Files:
	compiler-rt-netbsd/Makefile
	compiler-rt-netbsd/distinfo
	compiler-rt-netbsd/patches/patch-test_xray_lit.cfg

Log Message:
compiler-rt-netbsd: Update to SVN r. 325315

Rebase to head.

Patch for FreeBSD test/xray has been committed.

Sponsored by <The NetBSD Foundation>

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=43ac3b96042ee9add7301efbc578ea021974cf9f

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 compiler-rt-netbsd/Makefile                        |  2 +-
 compiler-rt-netbsd/distinfo                        |  2 +-
 compiler-rt-netbsd/patches/patch-test_xray_lit.cfg | 27 +++-------------------
 3 files changed, 5 insertions(+), 26 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/Makefile b/compiler-rt-netbsd/Makefile
index 220919cbda..a41f98d9d3 100644
--- a/compiler-rt-netbsd/Makefile
+++ b/compiler-rt-netbsd/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	lang devel
 
 SVN_REPOSITORIES=		compiler-rt
 SVN_REPO.compiler-rt=		http://llvm.org/svn/llvm-project/compiler-rt/trunk
-SVN_REVISION.compiler-rt=	325310
+SVN_REVISION.compiler-rt=	325315
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://compiler-rt.llvm.org/
diff --git a/compiler-rt-netbsd/distinfo b/compiler-rt-netbsd/distinfo
index 2ea597095d..dbb9453d66 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -18,4 +18,4 @@ SHA1 (patch-test_lsan_lit.common.cfg) = b09b4ab3a97dc881b701a3583b0b126b8206cfe2
 SHA1 (patch-test_sanitizer__common_TestCases_NetBSD_kvm__open.cc) = f9253e16ce5bd38e24a174c0d76f45e6b01ea310
 SHA1 (patch-test_sanitizer__common_TestCases_NetBSD_kvm__openfiles.cc) = a6004120ec1353ba8b605413c9ff2fda7664a653
 SHA1 (patch-test_scudo_lit.cfg) = 35e4f0524a8fd26e90e5d968b73d75f277da3779
-SHA1 (patch-test_xray_lit.cfg) = ebab42bf1210ed63e42b0d774bd524714300f8d4
+SHA1 (patch-test_xray_lit.cfg) = deec5f88b3b63dcc4ca3558ed699bc2324e5c1f8
diff --git a/compiler-rt-netbsd/patches/patch-test_xray_lit.cfg b/compiler-rt-netbsd/patches/patch-test_xray_lit.cfg
index 95203b261f..70f29c8bdb 100644
--- a/compiler-rt-netbsd/patches/patch-test_xray_lit.cfg
+++ b/compiler-rt-netbsd/patches/patch-test_xray_lit.cfg
@@ -1,33 +1,12 @@
 $NetBSD$
 
---- test/xray/lit.cfg.orig	2018-02-16 03:15:54.219563913 +0000
+--- test/xray/lit.cfg.orig	2018-02-16 04:30:56.947190042 +0000
 +++ test/xray/lit.cfg
-@@ -20,6 +20,11 @@ def build_invocation(compile_flags):
- llvm_xray = os.path.join(config.llvm_tools_dir, 'llvm-xray')
- 
- # Setup substitutions.
-+if config.host_os == "Linux":
-+  libdl_flag = "-ldl"
-+else:
-+  libdl_flag = ""
-+
- config.substitutions.append(
-     ('%clang ', build_invocation([config.target_cflags])))
- config.substitutions.append(
-@@ -33,14 +38,14 @@ config.substitutions.append(
-     ('%llvm_xray', llvm_xray))
- config.substitutions.append(
-     ('%xraylib',
--        ('-lm -lpthread -ldl -lrt -L%s '
-+        ('-lm -lpthread %s -lrt -L%s '
-          '-Wl,-whole-archive -lclang_rt.xray-%s -Wl,-no-whole-archive')
--        % (config.compiler_rt_libdir, config.host_arch)))
-+        % (libdl_flag, config.compiler_rt_libdir, config.host_arch)))
- 
+@@ -45,7 +45,7 @@ config.substitutions.append(
  # Default test suffixes.
  config.suffixes = ['.c', '.cc', '.cpp']
  
--if config.host_os not in ['Linux']:
+-if config.host_os not in ['FreeBSD', 'Linux']:
 +if config.host_os not in ['FreeBSD', 'Linux', 'NetBSD']:
    config.unsupported = True
  elif '64' not in config.host_arch:


Home | Main Index | Thread Index | Old Index