Attachment #181280 for bug #218195

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




# $FreeBSD$

PORTNAME=	libclc
DISTVERSION=	0.2.0.20170225
CATEGORIES=	devel

MAINTAINER=	x11@FreeBSD.org


USE_GITHUB=	yes
GH_ACCOUNT=	llvm-mirror
GH_TAGNAME=	17648cd

USES=		gmake python:2,build ninja
USE_LDCONFIG=	yes
MAKE_ENV=	MAKE=${GMAKE} DESTDIR=${STAGEDIR}

LLVMVER=	40

ALL_TARGET=


Lines 1-3 Link Here

(-)devel/libclc/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1480100311	1	TIMESTAMP = 1490314138
2	SHA256 (llvm-mirror-libclc-0.2.0.20160915-b091e26_GH0.tar.gz) = 821a4b7aa0fa84b1a790b72ba9e2df2820f0d4f565df1027eaad206d688ea741	2	SHA256 (llvm-mirror-libclc-0.2.0.20170225-17648cd_GH0.tar.gz) = 6dc87f14b3d928be657f0656eb58f4481e015dd85a4d62042a15955193349a3d
3	SIZE (llvm-mirror-libclc-0.2.0.20160915-b091e26_GH0.tar.gz) = 127259	3	SIZE (llvm-mirror-libclc-0.2.0.20170225-17648cd_GH0.tar.gz) = 132518




+++ configure.py
@@ -118,7 +118,8 @@ b.rule("OPT", command = llvm_opt + " -O3
        description = 'OPT $out')

 c_compiler_rule(b, "LLVM_TOOL_CXX", 'CXX', cxx_compiler, llvm_cxxflags)
-b.rule("LLVM_TOOL_LINK", cxx_compiler + " -o $out $in %s" % llvm_core_libs + " -Wl,-rpath %s" % llvm_libdir, 'LINK $out')
+b.rule("LLVM_TOOL_LINK", cxx_compiler + " -o $out $in %s" % llvm_core_libs +
+  " -L" + prefix + "/lib -Wl,-rpath %s" % llvm_libdir, 'LINK $out')

 prepare_builtins = os.path.join('utils', 'prepare-builtins')
 b.build(os.path.join('utils', 'prepare-builtins.o'), "LLVM_TOOL_CXX",
@@ -253,7 +253,7 @@ for target in targets:
     install_deps.append(builtins_bc)
     for alias in device['aliases']:
       # Ninja cannot have multiple rules with same name so append suffix
-      ruleName = "CREATE_ALIAS_{0}_for_{1}".format(alias, device['gpu'])
+      ruleName = "CREATE_ALIAS_{0}_for_{1}_{2}_{3}_{4}".format(alias, t_arch, t_vendor, t_os, device['gpu'])
       b.rule(ruleName, "ln -fs %s $out" % os.path.basename(builtins_bc)
              ,"CREATE-ALIAS $out")

@@ -264,7 +265,7 @@ install_cmd = ' && '.join(['mkdir -p ${D
                            {'src': file,
                             'dst': libexecdir}

Return to bug 218195

Lines 2-8 Link Here

(-)devel/libclc/Makefile (-3 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libclc	4	PORTNAME= libclc
5	DISTVERSION= 0.2.0.20160915	5	DISTVERSION= 0.2.0.20170225
6	CATEGORIES= devel	6	CATEGORIES= devel
7		7
8	MAINTAINER= x11@FreeBSD.org	8	MAINTAINER= x11@FreeBSD.org
Lines 15-27 Link Here
15		15
16	USE_GITHUB= yes	16	USE_GITHUB= yes
17	GH_ACCOUNT= llvm-mirror	17	GH_ACCOUNT= llvm-mirror
18	GH_TAGNAME= b091e26	18	GH_TAGNAME= 17648cd
19		19
20	USES= gmake python:2,build ninja	20	USES= gmake python:2,build ninja
21	USE_LDCONFIG= yes	21	USE_LDCONFIG= yes
22	MAKE_ENV= MAKE=${GMAKE} DESTDIR=${STAGEDIR}	22	MAKE_ENV= MAKE=${GMAKE} DESTDIR=${STAGEDIR}
23		23
24	LLVMVER= 39	24	LLVMVER= 40
25		25
26	ALL_TARGET=	26	ALL_TARGET=
27		27

Lines 8-21 Link Here

(-)devel/libclc/files/patch-configure.py (-3 / +12 lines)
8	+++ configure.py	8	+++ configure.py
9	@@ -118,7 +118,8 @@ b.rule("OPT", command = llvm_opt + " -O3	9	@@ -118,7 +118,8 @@ b.rule("OPT", command = llvm_opt + " -O3
10	description = 'OPT $out')	10	description = 'OPT $out')
11		11
12	c_compiler_rule(b, "LLVM_TOOL_CXX", 'CXX', cxx_compiler, llvm_cxxflags)	12	c_compiler_rule(b, "LLVM_TOOL_CXX", 'CXX', cxx_compiler, llvm_cxxflags)
13	-b.rule("LLVM_TOOL_LINK", cxx_compiler + " -o $out $in %s" % llvm_core_libs + " -Wl,-rpath %s" % llvm_libdir, 'LINK $out')	13	-b.rule("LLVM_TOOL_LINK", cxx_compiler + " -o $out $in %s" % llvm_core_libs + " -Wl,-rpath %s" % llvm_libdir, 'LINK $out')
14	+b.rule("LLVM_TOOL_LINK", cxx_compiler + " -o $out $in %s" % llvm_core_libs +	14	+b.rule("LLVM_TOOL_LINK", cxx_compiler + " -o $out $in %s" % llvm_core_libs +
15	+ " -L" + prefix + "/lib -Wl,-rpath %s" % llvm_libdir, 'LINK $out')	15	+ " -L" + prefix + "/lib -Wl,-rpath %s" % llvm_libdir, 'LINK $out')
16		16
17	prepare_builtins = os.path.join('utils', 'prepare-builtins')	17	prepare_builtins = os.path.join('utils', 'prepare-builtins')
18	b.build(os.path.join('utils', 'prepare-builtins.o'), "LLVM_TOOL_CXX",	18	b.build(os.path.join('utils', 'prepare-builtins.o'), "LLVM_TOOL_CXX",
		19	@@ -253,7 +253,7 @@ for target in targets:
		20	install_deps.append(builtins_bc)
		21	for alias in device['aliases']:
		22	# Ninja cannot have multiple rules with same name so append suffix
		23	- ruleName = "CREATE_ALIAS_{0}_for_{1}".format(alias, device['gpu'])
		24	+ ruleName = "CREATE_ALIAS_{0}_for_{1}_{2}_{3}_{4}".format(alias, t_arch, t_vendor, t_os, device['gpu'])
		25	b.rule(ruleName, "ln -fs %s $out" % os.path.basename(builtins_bc)
		26	,"CREATE-ALIAS $out")
		27
19	@@ -264,7 +265,7 @@ install_cmd = ' && '.join(['mkdir -p ${D	28	@@ -264,7 +265,7 @@ install_cmd = ' && '.join(['mkdir -p ${D
20	{'src': file,	29	{'src': file,
21	'dst': libexecdir}	30	'dst': libexecdir}