proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-06-13 05:59:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove the ocaml stuff

Browse Source
This commit is contained in:
Sylvestre Ledru 2017-04-09 12:43:13 +00:00
parent 9d8e0825eb
commit e986818a72
5 changed files with 45 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -4,8 +4,6 @@ llvm-toolchain-snapshot (1:5.0~svn298832-1~exp1) experimental; urgency=medium
undefined symbols undefined symbols
* Add override_dh_makeshlibs for the libllvm or liblldb versions * Add override_dh_makeshlibs for the libllvm or liblldb versions
Thanks to Julien Cristau for the patch Thanks to Julien Cristau for the patch
* Bring back the ocaml binding. thanks to Cyril Soldani for the patch
(Closes: #858626)
* change the min version of the libclang1 symbols to 1:4.0-3~ * change the min version of the libclang1 symbols to 1:4.0-3~
* Add override_dh_makeshlibs for the libllvm or liblldb versions * Add override_dh_makeshlibs for the libllvm or liblldb versions
Thanks to Julien Cristau for the patch Thanks to Julien Cristau for the patch

1
debian/clang-X.Y.links.in vendored
View File

@ -1,4 +1,3 @@
usr/share/clang/scan-build-@LLVM_VERSION@/bin/scan-build usr/bin/scan-build-@LLVM_VERSION@ usr/share/clang/scan-build-@LLVM_VERSION@/bin/scan-build usr/bin/scan-build-@LLVM_VERSION@
usr/share/clang/scan-build-py-@LLVM_VERSION@/bin/scan-build usr/bin/scan-build-py-@LLVM_VERSION@ usr/share/clang/scan-build-py-@LLVM_VERSION@/bin/scan-build usr/bin/scan-build-py-@LLVM_VERSION@
usr/share/clang/scan-view-@LLVM_VERSION@/bin/scan-view usr/bin/scan-view-@LLVM_VERSION@ usr/share/clang/scan-view-@LLVM_VERSION@/bin/scan-view usr/bin/scan-view-@LLVM_VERSION@

47
debian/control vendored
View File

@ -6,9 +6,10 @@ Uploaders: Sylvestre Ledru <sylvestre@debian.org>
Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl, expect, Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl, expect,
cmake, perl, libtool, chrpath, texinfo, sharutils, libffi-dev (>= 3.0.9), cmake, perl, libtool, chrpath, texinfo, sharutils, libffi-dev (>= 3.0.9),
lsb-release, patchutils, diffstat, xz-utils, python-dev, lsb-release, patchutils, diffstat, xz-utils, python-dev,
libedit-dev, swig, python-six, python-sphinx, ocaml-nox, binutils-dev, libedit-dev, swig, python-six, python-sphinx, binutils-dev,
libjsoncpp-dev, libjsoncpp-dev,
lcov, procps, help2man, dh-ocaml, zlib1g-dev, # ocaml-nox, libctypes-ocaml, ocaml-findlib, libctypes-ocaml-dev, dh-ocaml,
lcov, procps, help2man, zlib1g-dev,
g++-multilib [amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32] g++-multilib [amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32]
Build-Conflicts: oprofile, ocaml, libllvm-3.4-ocaml-dev, libllvm-3.5-ocaml-dev, Build-Conflicts: oprofile, ocaml, libllvm-3.4-ocaml-dev, libllvm-3.5-ocaml-dev,
libllvm-3.8-ocaml-dev, libllvm-3.9-ocaml-dev libllvm-3.8-ocaml-dev, libllvm-3.9-ocaml-dev
@ -333,26 +334,26 @@ Description: Modular compiler and toolchain technologies, tools
. .
This package provides tools for testing. This package provides tools for testing.
Package: libllvm-5.0-ocaml-dev #Package: libllvm-5.0-ocaml-dev
Section: ocaml #Section: ocaml
Architecture: any #Architecture: any
Suggests: llvm-5.0-doc #Suggests: llvm-5.0-doc
Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-5.0-dev (= ${binary:Version}) #Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-5.0-dev (= ${binary:Version})
Provides: ${ocaml:Provides} #Provides: ${ocaml:Provides}
Description: Modular compiler and toolchain technologies, OCaml bindings #Description: Modular compiler and toolchain technologies, OCaml bindings
LLVM is a collection of libraries and tools that make it easy to build # LLVM is a collection of libraries and tools that make it easy to build
compilers, optimizers, just-in-time code generators, and many other # compilers, optimizers, just-in-time code generators, and many other
compiler-related programs. # compiler-related programs.
. # .
LLVM uses a single, language-independent virtual instruction set both # LLVM uses a single, language-independent virtual instruction set both
as an offline code representation (to communicate code between # as an offline code representation (to communicate code between
compiler phases and to run-time systems) and as the compiler internal # compiler phases and to run-time systems) and as the compiler internal
representation (to analyze and transform programs). This persistent # representation (to analyze and transform programs). This persistent
code representation allows a common set of sophisticated compiler # code representation allows a common set of sophisticated compiler
techniques to be applied at compile-time, link-time, install-time, # techniques to be applied at compile-time, link-time, install-time,
run-time, or "idle-time" (between program runs). # run-time, or "idle-time" (between program runs).
. # .
This package provides the OCaml bindings to develop applications using llvm. # This package provides the OCaml bindings to develop applications using llvm.
Package: llvm-5.0-doc Package: llvm-5.0-doc
Section: doc Section: doc

18
debian/patches/add_symbols_versioning.patch vendored
View File

@ -12,29 +12,29 @@ Author: Rebecca N. Palmer <rebecca_palmer@zoho.com>
Author: Lisandro Damían Nicanor Pérez Meyer <lisandro@debian.org> Author: Lisandro Damían Nicanor Pérez Meyer <lisandro@debian.org>
Bug-Debian: https://bugs.debian.org/848368 Bug-Debian: https://bugs.debian.org/848368
Index: llvm-toolchain-snapshot_5.0~svn298832/tools/llvm-shlib/CMakeLists.txt Index: llvm-toolchain-4.0_4.0~svn299455/tools/llvm-shlib/CMakeLists.txt
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_5.0~svn298832.orig/tools/llvm-shlib/CMakeLists.txt --- llvm-toolchain-4.0_4.0~svn299455.orig/tools/llvm-shlib/CMakeLists.txt
+++ llvm-toolchain-snapshot_5.0~svn298832/tools/llvm-shlib/CMakeLists.txt +++ llvm-toolchain-4.0_4.0~svn299455/tools/llvm-shlib/CMakeLists.txt
@@ -40,7 +40,7 @@ set_property(TARGET LLVM PROPERTY VERSIO @@ -40,7 +40,7 @@ set_property(TARGET LLVM PROPERTY VERSIO
list(REMOVE_DUPLICATES LIB_NAMES) list(REMOVE_DUPLICATES LIB_NAMES)
if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD") OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "DragonFly")) # FIXME: It should be "GNU ld for elf" if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" OR MINGW) # FIXME: It should be "GNU ld for elf"
# GNU ld doesn't resolve symbols in the version script. # GNU ld doesn't resolve symbols in the version script.
- set(LIB_NAMES -Wl,--whole-archive ${LIB_NAMES} -Wl,--no-whole-archive) - set(LIB_NAMES -Wl,--whole-archive ${LIB_NAMES} -Wl,--no-whole-archive)
+ set(LIB_NAMES -Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/simple_version_script.map -Wl,--whole-archive ${LIB_NAMES} -Wl,--no-whole-archive) + set(LIB_NAMES -Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/simple_version_script.map -Wl,--whole-archive ${LIB_NAMES} -Wl,--no-whole-archive)
elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
set(LIB_NAMES -Wl,-all_load ${LIB_NAMES}) set(LIB_NAMES -Wl,-all_load ${LIB_NAMES})
endif() endif()
Index: llvm-toolchain-snapshot_5.0~svn298832/tools/llvm-shlib/simple_version_script.map Index: llvm-toolchain-4.0_4.0~svn299455/tools/llvm-shlib/simple_version_script.map
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ llvm-toolchain-snapshot_5.0~svn298832/tools/llvm-shlib/simple_version_script.map +++ llvm-toolchain-4.0_4.0~svn299455/tools/llvm-shlib/simple_version_script.map
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+LLVM_5.0 { global: *; }; +LLVM_5.0 { global: *; };
Index: llvm-toolchain-snapshot_5.0~svn298832/cmake/modules/AddLLVM.cmake Index: llvm-toolchain-4.0_4.0~svn299455/cmake/modules/AddLLVM.cmake
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_5.0~svn298832.orig/cmake/modules/AddLLVM.cmake --- llvm-toolchain-4.0_4.0~svn299455.orig/cmake/modules/AddLLVM.cmake
+++ llvm-toolchain-snapshot_5.0~svn298832/cmake/modules/AddLLVM.cmake +++ llvm-toolchain-4.0_4.0~svn299455/cmake/modules/AddLLVM.cmake
@@ -82,7 +82,7 @@ function(add_llvm_symbol_exports target_ @@ -82,7 +82,7 @@ function(add_llvm_symbol_exports target_
set(native_export_file "${target_name}.exports") set(native_export_file "${target_name}.exports")
# FIXME: Don't write the "local:" line on OpenBSD. # FIXME: Don't write the "local:" line on OpenBSD.

23
debian/rules vendored
View File

@ -22,7 +22,7 @@ DEB_HOST_GNU_TYPE = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_HOST_ARCH_BITS = $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS) DEB_HOST_ARCH_BITS = $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS)
DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH)
OCAML_STDLIB_DIR ?= $(shell ocamlc -where) #OCAML_STDLIB_DIR ?= $(shell ocamlc -where)
LDFLAGS_EXTRA = LDFLAGS_EXTRA =
CXXFLAGS_EXTRA = -std=c++0x CXXFLAGS_EXTRA = -std=c++0x
@ -141,7 +141,8 @@ endif
LLD_ENABLE=yes LLD_ENABLE=yes
%: %:
dh $@ --with ocaml dh $@
# --with ocaml
@ -151,13 +152,13 @@ preconfigure:
echo "$$f => $$f2"; \ echo "$$f => $$f2"; \
sed -e 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' \ sed -e 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' \
-e "s|@LLVM_VERSION_FULL@|$(LLVM_VERSION_FULL)|g" \ -e "s|@LLVM_VERSION_FULL@|$(LLVM_VERSION_FULL)|g" \
-e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" \
-e "s|@LLVM_VERSION@|$(LLVM_VERSION)|g" $$f > $$f2; \ -e "s|@LLVM_VERSION@|$(LLVM_VERSION)|g" $$f > $$f2; \
done done
# -e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g"
# Override this two targets. They are trying to manage the .in conversion for me # Override this two targets. They are trying to manage the .in conversion for me
override_dh_ocamlinit: #override_dh_ocamlinit:
override_dh_ocamlclean: #override_dh_ocamlclean:
override_dh_auto_configure: preconfigure override_dh_auto_configure: preconfigure
echo "Using gcc: " echo "Using gcc: "
@ -272,7 +273,7 @@ override_dh_prep: build_doc
build_doc: build_doc:
cd $(CURDIR)/docs && make -f Makefile.sphinx && make -f Makefile.sphinx man cd $(CURDIR)/docs && make -f Makefile.sphinx && make -f Makefile.sphinx man
cd $(CURDIR)/clang/docs && make -f Makefile.sphinx && make -f Makefile.sphinx man cd $(CURDIR)/clang/docs && make -f Makefile.sphinx && make -f Makefile.sphinx man
$(PRE_PROCESS) $(MAKE) $(NJOBS) -C "$(TARGET_BUILD)/docs" ocaml_doc # $(PRE_PROCESS) $(MAKE) $(NJOBS) -C "$(TARGET_BUILD)/docs" ocaml_doc
# Continue if failing, Ubuntu precise cannot generate manpages as sphinx is too old # Continue if failing, Ubuntu precise cannot generate manpages as sphinx is too old
-(cd $(TARGET_BUILD) && make $(NJOBS) docs-llvm-html docs-clang-html docs-clang-tools-html docs-polly-html docs-polly-man docs-clang-tools-man docs-clang-man docs-llvm-man) -(cd $(TARGET_BUILD) && make $(NJOBS) docs-llvm-html docs-clang-html docs-clang-tools-html docs-polly-html docs-polly-man docs-clang-tools-man docs-clang-man docs-llvm-man)
@ -422,11 +423,11 @@ override_dh_auto_install:
cp -R $(TARGET_BUILD)/tools/clang/tools/extra/docs/html $(CURDIR)/debian/usr/share/doc/clang-$(LLVM_VERSION)-doc/clang-extra cp -R $(TARGET_BUILD)/tools/clang/tools/extra/docs/html $(CURDIR)/debian/usr/share/doc/clang-$(LLVM_VERSION)-doc/clang-extra
# Rename OCaml bindings # Rename OCaml bindings
if test -d "$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ocaml"; then \ # if test -d "$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ocaml"; then \
mkdir -p "$(DEB_INST)$(OCAML_STDLIB_DIR)"; \ # mkdir -p "$(DEB_INST)$(OCAML_STDLIB_DIR)"; \
mv -f "$(DEB_INST)usr/lib/llvm-$(LLVM_VERSION)/lib/ocaml" \ # mv -f "$(DEB_INST)usr/lib/llvm-$(LLVM_VERSION)/lib/ocaml" \
"$(DEB_INST)$(OCAML_STDLIB_DIR)/llvm-$(LLVM_VERSION)"; \ # "$(DEB_INST)$(OCAML_STDLIB_DIR)/llvm-$(LLVM_VERSION)"; \
fi # fi
# Delete the target build directory to save some space on the build systems # Delete the target build directory to save some space on the build systems
# All the files have been installed in $(CURDIR)/debian/tmp/ already # All the files have been installed in $(CURDIR)/debian/tmp/ already