Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (087500566ad603fcc2fd6d2eae1a5ac75b395b80)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (087500566ad603fcc2fd6d2eae1a5ac75b395b80)
  • Date: Mon, 25 Sep 2017 10:00:51 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

devel/llvm/0001-fix-compile-error.patch | 29 -----------------------------
devel/llvm/HISTORY | 3 ---
devel/llvm/PRE_BUILD | 5 +----
http/serf/HISTORY | 4 ++++
http/serf/PRE_BUILD | 3 +++
http/serf/badprint.patch | 13 +++++++++++++
6 files changed, 21 insertions(+), 36 deletions(-)

New commits:
commit 087500566ad603fcc2fd6d2eae1a5ac75b395b80
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

serf: fix build regarding strange Python syntax error

I get an invalid syntax complaint from python via scons
for that print statement. Since it is just a configure
diagnostic, it can be disabled. And indeed: Serf now
builds for me! I do not understand this issue, though.

commit 04f3d39f637f732d62082e0ddbdc046c6adafb19
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

llvm: revert compile error patch

The added patch does _break_ the build with gcc 7.2 .

This reverts commit 973cf45c45610f97c67a91ae0b083b40b4a97ff2.

diff --git a/devel/llvm/0001-fix-compile-error.patch
b/devel/llvm/0001-fix-compile-error.patch
deleted file mode 100644
index 1d0feb2..0000000
--- a/devel/llvm/0001-fix-compile-error.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 72d31e2acc1dad39d4c778e21da3d632e61ae66f Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
-Date: Sun, 17 Sep 2017 23:02:48 +0200
-Subject: [PATCH] fix compile error
-
----
- lib/Support/NativeFormatting.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/Support/NativeFormatting.cpp
b/lib/Support/NativeFormatting.cpp
-index b951a88..3ed982c 100644
---- a/lib/Support/NativeFormatting.cpp
-+++ b/lib/Support/NativeFormatting.cpp
-@@ -163,10 +163,10 @@ void llvm::write_double(raw_ostream &S, double N,
FloatStyle Style,
- Optional<size_t> Precision) {
- size_t Prec = Precision.getValueOr(getDefaultPrecision(Style));
-
-- if (std::isnan(N)) {
-+ if (isnan(N)) {
- S << "nan";
- return;
-- } else if (std::isinf(N)) {
-+ } else if (isinf(N)) {
- S << "INF";
- return;
- }
---
-2.14.1
-
diff --git a/devel/llvm/HISTORY b/devel/llvm/HISTORY
index 697f4cf..1b4f37a 100644
--- a/devel/llvm/HISTORY
+++ b/devel/llvm/HISTORY
@@ -1,6 +1,3 @@
-2017-09-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * PRE_BUILD, 0001-fix-compile-error.patch
-
2017-09-11 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: swig is required only for LLDB

diff --git a/devel/llvm/PRE_BUILD b/devel/llvm/PRE_BUILD
index 95d253e..05b7873 100755
--- a/devel/llvm/PRE_BUILD
+++ b/devel/llvm/PRE_BUILD
@@ -44,7 +44,4 @@ if is_depends_enabled $SPELL python3;then
2to3 --no-diffs -wn .
fi &&
# do not build all backends
-sed -i "/^set.*all\"$/s/all//" "${SOURCE_DIRECTORY}/CMakeLists.txt" &&
-
-cd ${SOURCE_DIRECTORY} &&
-patch -p1 < $SPELL_DIRECTORY/0001-fix-compile-error.patch
+sed -i "/^set.*all\"$/s/all//" "${SOURCE_DIRECTORY}/CMakeLists.txt"
diff --git a/http/serf/HISTORY b/http/serf/HISTORY
index 1b843fa..908ba13 100644
--- a/http/serf/HISTORY
+++ b/http/serf/HISTORY
@@ -1,3 +1,7 @@
+2017-09-25 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD, badprint.patch: patch for eery syntax
+ error in SConstruct
+
2016-11-22 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.3.9
now at github
diff --git a/http/serf/PRE_BUILD b/http/serf/PRE_BUILD
new file mode 100755
index 0000000..f04844d
--- /dev/null
+++ b/http/serf/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+patch -p0 < "$SCRIPT_DIRECTORY/badprint.patch"
diff --git a/http/serf/badprint.patch b/http/serf/badprint.patch
new file mode 100644
index 0000000..6ec25e2
--- /dev/null
+++ b/http/serf/badprint.patch
@@ -0,0 +1,13 @@
+--- SConstruct.orig 2017-09-25 11:49:27.703917934 +0200
++++ SConstruct 2017-09-25 11:49:38.126918570 +0200
+@@ -182,8 +182,8 @@
+ # HANDLING OF OPTION VARIABLES
+
+ unknown = opts.UnknownVariables()
+-if unknown:
+- print 'Warning: Used unknown variables:', ', '.join(unknown.keys())
++#if unknown:
++# print 'Warning: Used unknown variables:', ', '.join(unknown.keys())
+
+ apr = str(env['APR'])
+ apu = str(env['APU'])



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (087500566ad603fcc2fd6d2eae1a5ac75b395b80), Thomas Orgis, 09/25/2017

Archive powered by MHonArc 2.6.24.

Top of Page