Skip to Content.
Sympa Menu

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

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 (ac995a64b68d21c17092214db5862fedb295e786)
  • Date: Tue, 18 Jun 2013 15:23:42 -0500

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

devel/llvm/DETAILS | 2 -
devel/llvm/HISTORY | 4 ++
devel/llvm/PRE_BUILD | 5 +--
devel/llvm/Tools.cpp.patch | 70
---------------------------------------------
4 files changed, 7 insertions(+), 74 deletions(-)

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

devel/llvm: adapted clang build with current version

diff --git a/devel/llvm/DETAILS b/devel/llvm/DETAILS
index ca19b2b..9dd85b6 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="clang-${VERSION}.src.tar.gz"
+ SOURCE3="cfe-${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 eb47da1..be05de9 100644
--- a/devel/llvm/HISTORY
+++ b/devel/llvm/HISTORY
@@ -1,3 +1,7 @@
+2013-06-18 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS, PRE_BUILD: adapted clang build with current version
+ * Tools.cpp.patch: removed
+
2013-06-18 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.3
* llvm.gpg: added E95C63DC Bill Wendling <wendling AT apple.com>
diff --git a/devel/llvm/PRE_BUILD b/devel/llvm/PRE_BUILD
index 354b48f..f21c54e 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 clang-${VERSION}.src clang &&
- cd ${SOURCE_DIRECTORY} &&
- patch -p1 < $SPELL_DIRECTORY/Tools.cpp.patch
+ mv cfe-${VERSION}.src cfe &&
+ 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 45e119c..0000000
--- a/devel/llvm/Tools.cpp.patch
+++ /dev/null
@@ -1,70 +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 2012-11-21 08:56:23.000000000 +0100
-+++ b/tools/clang/lib/Driver/Tools.cpp 2013-03-23 23:56:54.002059797 +0100
-@@ -1777,8 +1777,8 @@ void Clang::ConstructJob(Compilation &C,
- // any flavor of the '-fno-...' arguments, both PIC and PIE are disabled.
Any
- // PIE option implicitly enables PIC at the same level.
- bool PIE = false;
-- bool PIC = getToolChain().isPICDefault();
-- bool IsPICLevelTwo = PIC;
-+ bool pic = getToolChain().isPICDefault();
-+ bool IsPICLevelTwo = pic;
- if (Arg *A = Args.getLastArg(options::OPT_fPIC, options::OPT_fno_PIC,
- options::OPT_fpic, options::OPT_fno_pic,
- options::OPT_fPIE, options::OPT_fno_PIE,
-@@ -1787,26 +1787,26 @@ 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) ||
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;
- }
- }
- // Check whether the tool chain trumps the PIC-ness decision. If the
PIC-ness
- // is forced, then neither PIC nor PIE flags will have no effect.
- if (getToolChain().isPICDefaultForced()) {
- PIE = false;
-- PIC = getToolChain().isPICDefault();
-- IsPICLevelTwo = PIC;
-+ pic = getToolChain().isPICDefault();
-+ IsPICLevelTwo = pic;
- }
-
- // Inroduce a Darwin-specific hack. If the default is PIC but the flags
- // 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
-@@ -1816,9 +1816,9 @@ void Clang::ConstructJob(Compilation &C,
- Args.hasArg(options::OPT_fapple_kext)) &&
- (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
-@@ -1843,9 +1843,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 (ac995a64b68d21c17092214db5862fedb295e786), Pol Vinogradov, 06/18/2013

Archive powered by MHonArc 2.6.24.

Top of Page