llvm-toolchain-3.8 (1:3.8.1-16+dyson3)HEADdyson/3.8.1-16+dyson3master

4 files changed, 26 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index 3aef2e1..2e0d298 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+llvm-toolchain-3.8 (1:3.8.1-16+dyson3) unstable; urgency=medium
+
+  * Rebuild with proper fakeroot. Previously fakeroot could not find its
+    libraries, and building with sudo caused removal /dev/null and produced
+    broken packages (sic!)
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Thu, 25 May 2017 00:37:06 +0300
+
+llvm-toolchain-3.8 (1:3.8.1-16+dyson2) unstable; urgency=medium
+
+  * Fixed the issue when linked inputs are duplicated (updated
+    dyson-toolchain.patch)
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Thu, 25 May 2017 00:15:47 +0300
+
 llvm-toolchain-3.8 (1:3.8.1-16+dyson1) unstable; urgency=medium
 
   * Package for Dyson
diff --git a/debian/control b/debian/control
index 80c274d..a6c38b1 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl, expect,
     libedit-dev, swig, python-six, python-sphinx, ocaml-nox, binutils-dev,
     libjsoncpp-dev,
     lcov, procps, help2man, dh-ocaml, zlib1g-dev,
-    g++-multilib [amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32] <!cross>
+    g++-multilib [illumos-amd64 amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32] <!cross>
 Build-Conflicts: oprofile, ocaml, libllvm-3.4-ocaml-dev, libllvm-3.5-ocaml-dev,
  libllvm-3.8-ocaml-dev
 Standards-Version: 3.9.8
diff --git a/debian/patches/dyson-toolchain.patch b/debian/patches/dyson-toolchain.patch
index 0d6c2c0..2589a38 100644
--- a/debian/patches/dyson-toolchain.patch
+++ b/debian/patches/dyson-toolchain.patch
@@ -693,16 +693,19 @@ Index: llvm-toolchain-3.8-3.8.1/clang/lib/Driver/Tools.cpp
    if (Output.isFilename()) {
      CmdArgs.push_back("-o");
      CmdArgs.push_back(Output.getFilename());
-@@ -7447,7 +7520,7 @@ void solaris::Linker::ConstructJob(Compi
-   AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs);
+@@ -7444,10 +7517,8 @@ void solaris::Linker::ConstructJob(Compi
+   Args.AddAllArgs(CmdArgs, {options::OPT_L, options::OPT_T_Group,
+                             options::OPT_e, options::OPT_r});
  
+-  AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs);
+-
    if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) {
 -    if (getToolChain().getDriver().CCCIsCXX())
 +    if (D.CCCIsCXX())
        getToolChain().AddCXXStdlibLibArgs(Args, CmdArgs);
      CmdArgs.push_back("-lgcc_s");
      CmdArgs.push_back("-lc");
-@@ -7457,11 +7530,73 @@ void solaris::Linker::ConstructJob(Compi
+@@ -7457,11 +7528,73 @@ void solaris::Linker::ConstructJob(Compi
      }
    }
  
@@ -780,7 +783,7 @@ Index: llvm-toolchain-3.8-3.8.1/clang/lib/Driver/Tools.cpp
  
    getToolChain().addProfileRTLibs(Args, CmdArgs);
  
-@@ -8585,40 +8720,6 @@ void gnutools::Assembler::ConstructJob(C
+@@ -8585,40 +8718,6 @@ void gnutools::Assembler::ConstructJob(C
                     SplitDebugName(Args, Inputs[0]));
  }
  
@@ -821,7 +824,7 @@ Index: llvm-toolchain-3.8-3.8.1/clang/lib/Driver/Tools.cpp
  static std::string getLinuxDynamicLinker(const ArgList &Args,
                                           const toolchains::Linux &ToolChain) {
    const llvm::Triple::ArchType Arch = ToolChain.getArch();
-@@ -8685,28 +8786,6 @@ static std::string getLinuxDynamicLinker
+@@ -8685,28 +8784,6 @@ static std::string getLinuxDynamicLinker
      return "/lib64/ld-linux-x86-64.so.2";
  }
  
diff --git a/debian/rules b/debian/rules
index 023ea77..bf03364 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+export DH_VERBOSE=1
+
 TARGET_BUILD	:= build-llvm
 DEB_INST		:= $(CURDIR)/debian/tmp/
 #GCC_VERSION     := 4.8