git://git.jankratochvil.net
/
lldb-experimental.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(no commit message)
[lldb-experimental.git]
/
lldb-experimental.spec
diff --git
a/lldb-experimental.spec
b/lldb-experimental.spec
index
380a861
..
0138a10
100644
(file)
--- a/
lldb-experimental.spec
+++ b/
lldb-experimental.spec
@@
-1,7
+1,10
@@
%global fast 0
%global use_jankratochvil_dwz 1
%global fast 0
%global use_jankratochvil_dwz 1
-%global use_jankratochvil_uniqaddr 1
+# FIXME:
+%global use_jankratochvil_layout5 0
+%global use_jankratochvil_ocaml_doc 1
%global use_jankratochvil_rust 0
%global use_jankratochvil_rust 0
+%global use_nealsid_lldb_editline_remove_wchar 0
%global pkg_prefix /opt/%{name}
%global _unpackaged_files_terminate_build 0
# dwz: Couldn't find DIE referenced by DW_OP_GNU_parameter_ref
%global pkg_prefix /opt/%{name}
%global _unpackaged_files_terminate_build 0
# dwz: Couldn't find DIE referenced by DW_OP_GNU_parameter_ref
@@
-17,8
+20,8
@@
%global debug_package %{nil}
%endif
Name: lldb-experimental
%global debug_package %{nil}
%endif
Name: lldb-experimental
-Version: 1
3
.0.0
-Release: 0.20210
604snap5
%{?dist}
+Version: 1
4
.0.0
+Release: 0.20210
920snap0
%{?dist}
Summary: Next generation high-performance debugger - experimental trunk snapshot
License: NCSA
URL: http://lldb.llvm.org/
Summary: Next generation high-performance debugger - experimental trunk snapshot
License: NCSA
URL: http://lldb.llvm.org/
@@
-29,6
+32,9
@@
Source0: empty.tar
BuildRequires: clang git libedit-devel libatomic libxml2-devel zlib-devel valgrind-devel libpfm-devel
# https://src.fedoraproject.org/rpms/epydoc
#BuildRequires: epydoc
BuildRequires: clang git libedit-devel libatomic libxml2-devel zlib-devel valgrind-devel libpfm-devel
# https://src.fedoraproject.org/rpms/epydoc
#BuildRequires: epydoc
+%if 0%{?rhel} > 8 || 0%{?fedora} >= 34
+BuildRequires: ocaml-findlib ocaml-ctypes ocaml-ocamldoc
+%endif
%if 0%{?rhel:1} && 0%{?rhel} <= 7
#+ /usr/lib/rpm/brp-python-bytecompile /usr/bin/python 1
#Compiling /quad/home/jkratoch/redhat/lldb-experimental/BUILDROOT/lldb-experimental-13.0.0-0.20210206snap1.el7.x86_64/opt/lldb-experimental/lib64/python3.8/site-packages/lldb/__init__.py ...
%if 0%{?rhel:1} && 0%{?rhel} <= 7
#+ /usr/lib/rpm/brp-python-bytecompile /usr/bin/python 1
#Compiling /quad/home/jkratoch/redhat/lldb-experimental/BUILDROOT/lldb-experimental-13.0.0-0.20210206snap1.el7.x86_64/opt/lldb-experimental/lib64/python3.8/site-packages/lldb/__init__.py ...
@@
-37,7
+43,7
@@
BuildRequires: clang git libedit-devel libatomic libxml2-devel zlib-devel valgri
# ^
#SyntaxError: invalid syntax
%global __python /usr/bin/python3
# ^
#SyntaxError: invalid syntax
%global __python /usr/bin/python3
-BuildRequires:
devtoolset-8-gcc-c++
+BuildRequires:
llvm-toolset-7.0-clang llvm-toolset-7.0-lld
# swig on rhel7: /builddir/build/BUILD/lldb-experimental-11.0.0/lldb/bindings/./python/python-typemaps.swig:496: Error: Syntax error in input(3).
BuildRequires: swig3
BuildRequires: rh-git218-git-core
# swig on rhel7: /builddir/build/BUILD/lldb-experimental-11.0.0/lldb/bindings/./python/python-typemaps.swig:496: Error: Syntax error in input(3).
BuildRequires: swig3
BuildRequires: rh-git218-git-core
@@
-89,14
+95,22
@@
This package is an experimental trunk snapshot.
This package contains off-trunk DWZ support for Fedora debuginfos such as:
unsupported DW_FORM values: 0x1f20 0x1f21
%endif
This package contains off-trunk DWZ support for Fedora debuginfos such as:
unsupported DW_FORM values: 0x1f20 0x1f21
%endif
-%if %{use_jankratochvil_
uniqaddr
}
+%if %{use_jankratochvil_
layout5
}
This package contains off-trunk:
Support for libstdc++11 std::unique_ptr: [[no_unique_address]]
%endif
This package contains off-trunk:
Support for libstdc++11 std::unique_ptr: [[no_unique_address]]
%endif
+%if %{use_jankratochvil_ocaml_doc}
+This package contains off-trunk:
+ ocaml_doc fix
+%endif
%if %{use_jankratochvil_rust}
This package contains off-trunk Rust support:
https://github.com/rust-lang-nursery/lldb
%endif
%if %{use_jankratochvil_rust}
This package contains off-trunk Rust support:
https://github.com/rust-lang-nursery/lldb
%endif
+%if %{use_nealsid_lldb_editline_remove_wchar}
+This package contains:
+ https://github.com/nealsid/llvm-project/tree/lldb-editline-remove-wchar
+%endif
%package devel
Summary: Development header files for %{name}
%package devel
Summary: Development header files for %{name}
@@
-164,7
+178,7
@@
CLONEOPTS="--single-branch"
test -d ../$REF/ && CLONEOPTS="$CLONEOPTS --reference ../$REF"
# 2500 = 1 month in 2019
git clone $OPTS $CLONEOPTS https://github.com/llvm/llvm-project.git .
test -d ../$REF/ && CLONEOPTS="$CLONEOPTS --reference ../$REF"
# 2500 = 1 month in 2019
git clone $OPTS $CLONEOPTS https://github.com/llvm/llvm-project.git .
-%if
%{use_jankratochvil_dwz} || %{use_jankratochvil_rust}
+%if
1
git remote remove jankratochvil || :
#git remote add jankratochvil git://git.jankratochvil.net/lldb
git remote add jankratochvil https://github.com/jankratochvil/llvm-project.git
git remote remove jankratochvil || :
#git remote add jankratochvil git://git.jankratochvil.net/lldb
git remote add jankratochvil https://github.com/jankratochvil/llvm-project.git
@@
-175,14
+189,22
@@
git config user.name jankratochvil
%if %{use_jankratochvil_dwz}
git merge jankratochvil/dwz
%endif
%if %{use_jankratochvil_dwz}
git merge jankratochvil/dwz
%endif
-%if %{use_jankratochvil_uniqaddr}
-git merge jankratochvil/layout3
+%if %{use_jankratochvil_layout5}
+git merge jankratochvil/layout5
+%endif
+%if %{use_jankratochvil_ocaml_doc}
+git merge jankratochvil/ocaml_doc
%endif
%if %{use_jankratochvil_rust}
# '-c merge.renames=false' is F-29+.
# '-c merge.renameLimit=0' has no effect.
git -c merge.renameLimit=1 merge jankratochvil/rust
%endif
%endif
%if %{use_jankratochvil_rust}
# '-c merge.renames=false' is F-29+.
# '-c merge.renameLimit=0' has no effect.
git -c merge.renameLimit=1 merge jankratochvil/rust
%endif
+%if %{use_nealsid_lldb_editline_remove_wchar}
+git remote add nealsid https://github.com/nealsid/llvm-project.git
+git fetch nealsid
+git merge nealsid/lldb-editline-remove-wchar
+%endif
%build
FLAGS="%{optflags}"
%build
FLAGS="%{optflags}"
@@
-191,7
+213,7
@@
FLAGS="%{optflags}"
FLAGS="$FLAGS -Wno-error=format-security"
%if (0%{?rhel:1} && 0%{?rhel} <= 7)
FLAGS="$FLAGS -Wno-error=format-security"
%if (0%{?rhel:1} && 0%{?rhel} <= 7)
-. /opt/rh/
devtoolset-8
/enable
+. /opt/rh/
llvm-toolset-7.0
/enable
. /opt/rh/rh-python38/enable
%endif
%if %{fast}
. /opt/rh/rh-python38/enable
%endif
%if %{fast}
@@
-207,12
+229,19
@@
FLAGS="$FLAGS -fdebug-types-section"
# clang-12: error: unsupported argument 'auto' to option 'flto='
# clang-12: warning: optimization flag '-ffat-lto-objects' is not supported [-Wignored-optimization-argument]
# clang-12: error: unsupported argument 'auto' to option 'flto='
# clang-12: warning: optimization flag '-ffat-lto-objects' is not supported [-Wignored-optimization-argument]
-FLAGS="$(echo $FLAGS|sed 's/
-flto=auto -ffat-lto-objects/-flto
/')"
+FLAGS="$(echo $FLAGS|sed 's/
-flto=auto -ffat-lto-objects / -flto
/')"
# ld.lld: error: relocation R_X86_64_PC32 cannot be used against symbol ...; recompile with -fPIC
FLAGS="$FLAGS -fPIC"
# ld.lld: error: relocation R_X86_64_PC32 cannot be used against symbol ...; recompile with -fPIC
FLAGS="$FLAGS -fPIC"
+%if 0%{?rhel:1} && 0%{?rhel} <= 7
+# clang: error: unknown argument: '-fstack-protector-strong'
+FLAGS="$(echo $FLAGS|sed 's/ -fstack-protector-strong / /')"
+%endif
+
+export CFLAGS="$FLAGS"
+export CXXFLAGS="$FLAGS"
-
CFLAGS="$FLAGS
"
-
CXXFLAGS="$FLAGS
"
+
export LDFLAGS="%{build_ldflags}
"
+
LDFLAGS="$LDFLAGS -flto -Wl,--build-id=sha1
"
# This is default - changing it breaks the testsuite: -DLLVM_LINK_LLVM_DYLIB=OFF
# It does not work: -DDCMAKE_EXECUTABLE_SUFFIX=-experimental
# This is default - changing it breaks the testsuite: -DLLVM_LINK_LLVM_DYLIB=OFF
# It does not work: -DDCMAKE_EXECUTABLE_SUFFIX=-experimental
@@
-249,7
+278,7
@@
CXXFLAGS="$FLAGS"
%install
mkdir -p %{buildroot}%{pkg_prefix}
(function revline {
%install
mkdir -p %{buildroot}%{pkg_prefix}
(function revline {
- echo "$(cd $1;git rev-parse ${2:-origin/ma
ster
}) ${2:-$1}"
+ echo "$(cd $1;git rev-parse ${2:-origin/ma
in
}) ${2:-$1}"
}
revline .
%if %{use_jankratochvil_dwz}
}
revline .
%if %{use_jankratochvil_dwz}
@@
-258,7
+287,7
@@
mkdir -p %{buildroot}%{pkg_prefix}
%if %{use_jankratochvil_rust}
revline . jankratochvil/rust
%endif
%if %{use_jankratochvil_rust}
revline . jankratochvil/rust
%endif
-) >%{buildroot}%{pkg_prefix}/
HEAD
+) >%{buildroot}%{pkg_prefix}/
commit
%cmake_install
mkdir -p %{buildroot}%{_bindir}
# lldb-mi
%cmake_install
mkdir -p %{buildroot}%{_bindir}
# lldb-mi
@@
-279,7
+308,7
@@
du -shc $PWD %{buildroot}
%files
%{_bindir}/lldb-experimental
#{_bindir}/lldb-mi-experimental
%files
%{_bindir}/lldb-experimental
#{_bindir}/lldb-mi-experimental
-%{pkg_prefix}/
HEAD
+%{pkg_prefix}/
commit
%{pkg_prefix}/bin/lldb
%{pkg_prefix}/bin/lldb-server
#{pkg_prefix}/bin/lldb-mi
%{pkg_prefix}/bin/lldb
%{pkg_prefix}/bin/lldb-server
#{pkg_prefix}/bin/lldb-mi