Re: [Mesa-dev] [PATCH libclc] Make libclc more Linux FHS conform.
On Fri, Nov 30, 2012 at 01:44:57AM +0100, Johannes Obermayr wrote:
- First introducing a versioning scheme
- Add --libexecdir, --includedir and --pkgconfigdir and prefill them as well
as --prefix
- Build all targets by default
- Create clc.pc and install it in $pkgconfigdir
- Use clang++ instead of c++
- Rename builtins.bc to built_libs/$triple.bc and install them in $libexecdir
- Includes are installed recursively to $includedir
- Finally add $(DESTDIR) for 'make install'
Hi Johannes,
Thanks for these build system cleanups, they were sorely needed. The
Mesa patch looks good to me. I've forwarded this patch to the libclc
mailing list to see if they would be interested in applying this
upstream.
The only issue I have with this patch is that it builds the
'nvptx--nvidiacl', and 'nvptx64--nvidiacl' targets by default. This is
actually what upstream libclc does, but in my libclc tree I want to keep
r600 as the only default target, because I don't want broken nvptx
builds to prevent users from building r600. So, I'll drop this chunk
before I apply the patch.
I'll push these two patches once I get a chance to update the
documentation and test older LLVM / Mesa versions.
-Tom
---
configure.py | 67
+-
1 Datei geändert, 52 Zeilen hinzugefügt(+), 15 Zeilen entfernt(-)
diff --git a/configure.py b/configure.py
index 5062ab6..66789a2 100755
--- a/configure.py
+++ b/configure.py
@@ -4,6 +4,10 @@ def c_compiler_rule(b, name, description, compiler, flags):
command = %s -MMD -MF $out.d %s -c -o $out $in % (compiler, flags)
b.rule(name, command, description + $out, depfile=$out.d)
+version_major = 0;
+version_minor = 0;
+version_patch = 1;
+
from optparse import OptionParser
import os
from subprocess import *
@@ -19,12 +23,34 @@ p.add_option('--with-llvm-config', metavar='PATH',
help='use given llvm-config script')
p.add_option('--prefix', metavar='PATH',
help='install to given prefix')
+p.add_option('--libexecdir', metavar='PATH',
+ help='install *.bc to given dir')
+p.add_option('--includedir', metavar='PATH',
+ help='install include files to given dir')
+p.add_option('--pkgconfigdir', metavar='PATH',
+ help='install clc.pc to given dir')
p.add_option('-g', metavar='GENERATOR', default='make',
help='use given generator (default: make)')
(options, args) = p.parse_args()
llvm_config_exe = options.with_llvm_config or llvm-config
+prefix = options.prefix
+if not prefix:
+ prefix = '/usr/local'
+
+libexecdir = options.libexecdir
+if not libexecdir:
+ libexecdir = os.path.join(prefix, 'lib/clc')
+
+includedir = options.includedir
+if not includedir:
+ includedir = os.path.join(prefix, 'include')
+
+pkgconfigdir = options.pkgconfigdir
+if not pkgconfigdir:
+ pkgconfigdir = os.path.join(prefix, 'lib/pkgconfig')
+
def llvm_config(args):
try:
proc = Popen([llvm_config_exe] + args, stdout=PIPE)
@@ -42,7 +68,7 @@ llvm_clang = os.path.join(llvm_bindir, 'clang')
llvm_link = os.path.join(llvm_bindir, 'llvm-link')
llvm_opt = os.path.join(llvm_bindir, 'opt')
-default_targets = ['r600--']
+default_targets = ['nvptx--nvidiacl', 'nvptx64--nvidiacl', 'r600--']
targets = args
if not targets:
@@ -57,8 +83,8 @@ b.rule(LLVM_LINK, command = llvm_link + -o $out $in,
b.rule(OPT, command = llvm_opt + -O3 -o $out $in,
description = 'OPT $out')
-c_compiler_rule(b, LLVM_TOOL_CXX, 'CXX', 'c++', llvm_cxxflags)
-b.rule(LLVM_TOOL_LINK, c++ -o $out $in %s % llvm_core_libs, 'LINK $out')
+c_compiler_rule(b, LLVM_TOOL_CXX, 'LLVM-CXX', 'clang++', llvm_cxxflags)
+b.rule(LLVM_TOOL_LINK, clang++ -o $out $in %s % llvm_core_libs, 'LINK
$out')
prepare_builtins = os.path.join('utils', 'prepare-builtins')
b.build(os.path.join('utils', 'prepare-builtins.o'), LLVM_TOOL_CXX,
@@ -72,9 +98,15 @@ b.rule(PREPARE_BUILTINS, %s -o $out $in %
prepare_builtins,
manifest_deps = set([sys.argv[0], os.path.join(srcdir, 'build',
'metabuild.py'),
os.path.join(srcdir, 'build', 'ninja_syntax.py')])
-install_files = []
+install_files_bc = []
install_deps = []
+# Create libclc.pc
+clc = open('libclc.pc', 'w')
+clc.write('includedir=%(inc)s\nlibexecdir=%(lib)s\n\nName:
libclc\nDescription: Library requirements of the OpenCL C programming
language\nVersion: %(maj)s.%(min)s.%(pat)s\nCflags: -I${includedir}\nLibs:
-L${libexecdir}' %
+{'inc': includedir, 'lib': libexecdir, 'maj': version_major, 'min':
version_minor, 'pat': version_patch})
+clc.close()
+
for target in targets:
(t_arch, t_vendor, t_os) = target.split('-')
archs = [t_arch]
@@ -94,7 +126,6 @@ for target in targets:
[os.path.join(srcdir, subdir, 'lib') for subdir in
subdirs])
clang_cl_includes = ' '.join([-I%s % incdir for incdir in incdirs])
-
[Mesa-dev] [PATCH libclc] Make libclc more Linux FHS conform.
- First introducing a versioning scheme
- Add --libexecdir, --includedir and --pkgconfigdir and prefill them as well as
--prefix
- Build all targets by default
- Create clc.pc and install it in $pkgconfigdir
- Use clang++ instead of c++
- Rename builtins.bc to built_libs/$triple.bc and install them in $libexecdir
- Includes are installed recursively to $includedir
- Finally add $(DESTDIR) for 'make install'
---
configure.py | 67 +-
1 Datei geändert, 52 Zeilen hinzugefügt(+), 15 Zeilen entfernt(-)
diff --git a/configure.py b/configure.py
index 5062ab6..66789a2 100755
--- a/configure.py
+++ b/configure.py
@@ -4,6 +4,10 @@ def c_compiler_rule(b, name, description, compiler, flags):
command = %s -MMD -MF $out.d %s -c -o $out $in % (compiler, flags)
b.rule(name, command, description + $out, depfile=$out.d)
+version_major = 0;
+version_minor = 0;
+version_patch = 1;
+
from optparse import OptionParser
import os
from subprocess import *
@@ -19,12 +23,34 @@ p.add_option('--with-llvm-config', metavar='PATH',
help='use given llvm-config script')
p.add_option('--prefix', metavar='PATH',
help='install to given prefix')
+p.add_option('--libexecdir', metavar='PATH',
+ help='install *.bc to given dir')
+p.add_option('--includedir', metavar='PATH',
+ help='install include files to given dir')
+p.add_option('--pkgconfigdir', metavar='PATH',
+ help='install clc.pc to given dir')
p.add_option('-g', metavar='GENERATOR', default='make',
help='use given generator (default: make)')
(options, args) = p.parse_args()
llvm_config_exe = options.with_llvm_config or llvm-config
+prefix = options.prefix
+if not prefix:
+ prefix = '/usr/local'
+
+libexecdir = options.libexecdir
+if not libexecdir:
+ libexecdir = os.path.join(prefix, 'lib/clc')
+
+includedir = options.includedir
+if not includedir:
+ includedir = os.path.join(prefix, 'include')
+
+pkgconfigdir = options.pkgconfigdir
+if not pkgconfigdir:
+ pkgconfigdir = os.path.join(prefix, 'lib/pkgconfig')
+
def llvm_config(args):
try:
proc = Popen([llvm_config_exe] + args, stdout=PIPE)
@@ -42,7 +68,7 @@ llvm_clang = os.path.join(llvm_bindir, 'clang')
llvm_link = os.path.join(llvm_bindir, 'llvm-link')
llvm_opt = os.path.join(llvm_bindir, 'opt')
-default_targets = ['r600--']
+default_targets = ['nvptx--nvidiacl', 'nvptx64--nvidiacl', 'r600--']
targets = args
if not targets:
@@ -57,8 +83,8 @@ b.rule(LLVM_LINK, command = llvm_link + -o $out $in,
b.rule(OPT, command = llvm_opt + -O3 -o $out $in,
description = 'OPT $out')
-c_compiler_rule(b, LLVM_TOOL_CXX, 'CXX', 'c++', llvm_cxxflags)
-b.rule(LLVM_TOOL_LINK, c++ -o $out $in %s % llvm_core_libs, 'LINK $out')
+c_compiler_rule(b, LLVM_TOOL_CXX, 'LLVM-CXX', 'clang++', llvm_cxxflags)
+b.rule(LLVM_TOOL_LINK, clang++ -o $out $in %s % llvm_core_libs, 'LINK
$out')
prepare_builtins = os.path.join('utils', 'prepare-builtins')
b.build(os.path.join('utils', 'prepare-builtins.o'), LLVM_TOOL_CXX,
@@ -72,9 +98,15 @@ b.rule(PREPARE_BUILTINS, %s -o $out $in %
prepare_builtins,
manifest_deps = set([sys.argv[0], os.path.join(srcdir, 'build',
'metabuild.py'),
os.path.join(srcdir, 'build', 'ninja_syntax.py')])
-install_files = []
+install_files_bc = []
install_deps = []
+# Create libclc.pc
+clc = open('libclc.pc', 'w')
+clc.write('includedir=%(inc)s\nlibexecdir=%(lib)s\n\nName:
libclc\nDescription: Library requirements of the OpenCL C programming
language\nVersion: %(maj)s.%(min)s.%(pat)s\nCflags: -I${includedir}\nLibs:
-L${libexecdir}' %
+{'inc': includedir, 'lib': libexecdir, 'maj': version_major, 'min':
version_minor, 'pat': version_patch})
+clc.close()
+
for target in targets:
(t_arch, t_vendor, t_os) = target.split('-')
archs = [t_arch]
@@ -94,7 +126,6 @@ for target in targets:
[os.path.join(srcdir, subdir, 'lib') for subdir in subdirs])
clang_cl_includes = ' '.join([-I%s % incdir for incdir in incdirs])
- install_files += [(incdir, incdir[len(srcdir)+1:]) for incdir in incdirs]
# The rule for building a .bc file for the specified architecture using
clang.
clang_bc_flags = -target %s -I`dirname $in` %s \
@@ -129,22 +160,28 @@ for target in targets:
builtins_link_bc = os.path.join(target, 'lib', 'builtins.link.bc')
builtins_opt_bc = os.path.join(target, 'lib', 'builtins.opt.bc')
- builtins_bc = os.path.join(target, 'lib', 'builtins.bc')
+ builtins_bc = os.path.join('built_libs', target + '.bc')
b.build(builtins_link_bc, LLVM_LINK, objects)
b.build(builtins_opt_bc, OPT, builtins_link_bc)
b.build(builtins_bc, PREPARE_BUILTINS, builtins_opt_bc, prepare_builtins)
- install_files.append((builtins_bc, builtins_bc))
+ install_files_bc.append((builtins_bc, builtins_bc))
install_deps.append(builtins_bc)
b.default(builtins_bc)
-if options.prefix:
- install_cmd = '
