Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Pol Vinogradov (6298c1a7878fc0c731de0d62b2ccd5b545512b83)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pol Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Pol Vinogradov (6298c1a7878fc0c731de0d62b2ccd5b545512b83)
  • Date: Wed, 26 Mar 2014 12:15:54 -0500

GIT changes to devel-xorg-modular grimoire by Pol Vinogradov
<vin.public AT gmail.com>:

devel/llvm/DETAILS | 2 -
devel/llvm/HISTORY | 5 +++
devel/llvm/PRE_BUILD | 5 +--
devel/llvm/Tools.cpp.patch | 62
---------------------------------------------
4 files changed, 8 insertions(+), 66 deletions(-)

New commits:
commit 6298c1a7878fc0c731de0d62b2ccd5b545512b83
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

devel/llvm: fixed clang tarball name change, removed patching of Tools.cpp

diff --git a/devel/llvm/DETAILS b/devel/llvm/DETAILS
index 411744d..8e66fb5 100755
--- a/devel/llvm/DETAILS
+++ b/devel/llvm/DETAILS
@@ -7,7 +7,7 @@
SOURCE_GPG=llvm.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
if [[ "$LLVM_WITH_CLANG" == y ]]; then
- SOURCE3="cfe-${VERSION}.src.tar.gz"
+ SOURCE3="clang-${VERSION}.src.tar.gz"
SOURCE3_URL[0]="http://${SPELL}.org/releases/${VERSION}/${SOURCE3}";
SOURCE4="$SOURCE3.sig"
SOURCE4_URL[0]="${SOURCE3_URL[0]}.sig"
diff --git a/devel/llvm/HISTORY b/devel/llvm/HISTORY
index 817826d..f89bd96 100644
--- a/devel/llvm/HISTORY
+++ b/devel/llvm/HISTORY
@@ -1,3 +1,8 @@
+2014-03-26 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: SOURCE3 was updated to upstream
+ * PRE_BUILD: corrected clang directory name change, removed patching
of Tools.cpp
+ * Tools.cpp.patch: removed
+
2014-01-06 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.4
* llvm.gpg: add key BB5A0569: "Bill Wendling <void AT llvm.org>"
diff --git a/devel/llvm/PRE_BUILD b/devel/llvm/PRE_BUILD
index e75277d..917f81f 100755
--- a/devel/llvm/PRE_BUILD
+++ b/devel/llvm/PRE_BUILD
@@ -2,9 +2,8 @@ default_pre_build &&
if [[ "$LLVM_WITH_CLANG" == y ]]; then
cd ${SOURCE_DIRECTORY}/tools &&
unpack_file 3 &&
- mv cfe-${VERSION}.src clang &&
- cd ${SOURCE_DIRECTORY} &&
- patch -p1 < $SPELL_DIRECTORY/Tools.cpp.patch
+ mv clang-${VERSION} clang &&
+ cd ${SOURCE_DIRECTORY}
fi &&
# small cmake related fix for libffi
cd ${SOURCE_DIRECTORY} &&
diff --git a/devel/llvm/Tools.cpp.patch b/devel/llvm/Tools.cpp.patch
deleted file mode 100644
index 6f021c8..0000000
--- a/devel/llvm/Tools.cpp.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -Naupr a/tools/clang/lib/Driver/Tools.cpp
b/tools/clang/lib/Driver/Tools.cpp
---- a/tools/clang/lib/Driver/Tools.cpp 2013-06-20 16:07:00.963603781 -0400
-+++ b/tools/clang/lib/Driver/Tools.cpp 2013-06-20 16:21:21.170717583 -0400
-@@ -2038,8 +2038,8 @@ void Clang::ConstructJob(Compilation &C,
- CheckCodeGenerationOptions(D, Args);
-
- bool PIE = getToolChain().isPIEDefault();
-- bool PIC = PIE || getToolChain().isPICDefault();
-- bool IsPICLevelTwo = PIC;
-+ bool pic = PIE || getToolChain().isPICDefault();
-+ bool IsPICLevelTwo = pic;
-
- // For the PIC and PIE flag options, this logic is different from the
- // legacy logic in very old versions of GCC, as that logic was just
-@@ -2061,12 +2061,12 @@ void Clang::ConstructJob(Compilation &C,
- if (O.matches(options::OPT_fPIC) || O.matches(options::OPT_fpic) ||
- O.matches(options::OPT_fPIE) || O.matches(options::OPT_fpie)) {
- PIE = O.matches(options::OPT_fPIE) || O.matches(options::OPT_fpie);
-- PIC = PIE || O.matches(options::OPT_fPIC) ||
-+ pic = PIE || O.matches(options::OPT_fPIC) ||
- O.matches(options::OPT_fpic);
- IsPICLevelTwo = O.matches(options::OPT_fPIE) ||
- O.matches(options::OPT_fPIC);
- } else {
-- PIE = PIC = false;
-+ PIE = pic = false;
- }
- }
- }
-@@ -2075,7 +2075,7 @@ void Clang::ConstructJob(Compilation &C,
- // specified while enabling PIC enabled level 1 PIC, just force it back to
- // level 2 PIC instead. This matches the behavior of Darwin GCC (based on
my
- // informal testing).
-- if (PIC && getToolChain().getTriple().isOSDarwin())
-+ if (pic && getToolChain().getTriple().isOSDarwin())
- IsPICLevelTwo |= getToolChain().isPICDefault();
-
- // Note that these flags are trump-cards. Regardless of the order w.r.t.
the
-@@ -2084,9 +2084,9 @@ void Clang::ConstructJob(Compilation &C,
- if (KernelOrKext &&
- (Triple.getOS() != llvm::Triple::IOS ||
- Triple.isOSVersionLT(6)))
-- PIC = PIE = false;
-+ pic = PIE = false;
- if (Args.hasArg(options::OPT_static))
-- PIC = PIE = false;
-+ pic = PIE = false;
-
- if (Arg *A = Args.getLastArg(options::OPT_mdynamic_no_pic)) {
- // This is a very special mode. It trumps the other modes, almost no one
-@@ -2111,9 +2111,9 @@ void Clang::ConstructJob(Compilation &C,
- // Currently, LLVM only knows about PIC vs. static; the PIE differences
are
- // handled in Clang's IRGen by the -pie-level flag.
- CmdArgs.push_back("-mrelocation-model");
-- CmdArgs.push_back(PIC ? "pic" : "static");
-+ CmdArgs.push_back(pic ? "pic" : "static");
-
-- if (PIC) {
-+ if (pic) {
- CmdArgs.push_back("-pic-level");
- CmdArgs.push_back(IsPICLevelTwo ? "2" : "1");
- if (PIE) {



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Pol Vinogradov (6298c1a7878fc0c731de0d62b2ccd5b545512b83), Pol Vinogradov, 03/26/2014

Archive powered by MHonArc 2.6.24.

Top of Page