Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (4aba332c102aa6e685e7ff54f42344c725a1b03f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (4aba332c102aa6e685e7ff54f42344c725a1b03f)
  • Date: Sat, 1 Apr 2017 11:35:28 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

database/firebird3/BUILD |
2
database/firebird3/HISTORY |
6 +
database/firebird3/PREPARE |
6 -
database/firebird3/patches/0001-use-system-libedit.patch |
8 +-
database/firebird3/patches/0002-use-system-libtommath.patch |
6 -
database/firebird3/patches/0003-pcmet.epp-no-longer-exists.patch |
6 -
database/firebird3/patches/0004-suppress-some-includes.patch |
6 -
database/firebird3/patches/0005-cmake-fix-for-non-sse4.2-machine.patch |
38 ++++++++++
python-pypi/sqlalchemy/DETAILS |
4 -
python-pypi/sqlalchemy/HISTORY |
3
10 files changed, 63 insertions(+), 22 deletions(-)

New commits:
commit 4aba332c102aa6e685e7ff54f42344c725a1b03f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

firebird3 - fix compile on amd-a4, which lacks sse4.2 instructions

commit f625f9f3274fa3ec4516ee1ed9806bfdef854fca
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

sqlalchemy: => 1.1.8

diff --git a/database/firebird3/BUILD b/database/firebird3/BUILD
index 4734967..eaf9103 100755
--- a/database/firebird3/BUILD
+++ b/database/firebird3/BUILD
@@ -1,4 +1,4 @@
-CXXFLAGS+=" -Wno-narrowing -msse4" &&
+CXXFLAGS+=" -Wno-narrowing -Wno-deprecated-declarations
-Wno-invalid-offsetof" &&
CXXFLAGS+=" -fno-sized-deallocation -fno-delete-null-pointer-checks
-flifetime-dse=1 -fcheck-new" &&
persistent_add FB_PREFIX &&
FB_PREFIX=${INSTALL_ROOT}/opt/firebird &&
diff --git a/database/firebird3/HISTORY b/database/firebird3/HISTORY
index 8108eba..9c4e95d 100644
--- a/database/firebird3/HISTORY
+++ b/database/firebird3/HISTORY
@@ -1,3 +1,9 @@
+2017-04-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * PREPARE BUILD: revert pervious patch
+ * BUILD: suppress some warnings
+ * patches/*: update
+ fix compile on amd-a4, which lacks sse4.2 instructions
+
2017-03-31 Treeve Jelbert <treeve AT sourcemage.org>
* PREPARE: checak for ss4_2 instructions
* BUILD: force -msse4
diff --git a/database/firebird3/PREPARE b/database/firebird3/PREPARE
index 538af89..823f163 100755
--- a/database/firebird3/PREPARE
+++ b/database/firebird3/PREPARE
@@ -1,9 +1,3 @@
-# fb3 now requires sse4 support
-if ! grep -q sse4_2 /proc/cpuinfo ;then
- message ${PROBLEM_COLOR}'A CPU with SSE4_2 is required!'${DEFAULT_COLOR}
&&
- return 1
-fi
-
# warn about need for backup/restore of existing databases
if ( spell_ok firebird25 ) || (spell_ok firebird );then
message "${PROBLEM_COLOR}Firebird3 cannot read old databases!" \
diff --git a/database/firebird3/patches/0001-use-system-libedit.patch
b/database/firebird3/patches/0001-use-system-libedit.patch
index 6f18af2..bf151f6 100644
--- a/database/firebird3/patches/0001-use-system-libedit.patch
+++ b/database/firebird3/patches/0001-use-system-libedit.patch
@@ -1,7 +1,7 @@
-From c9778ad0146f0571a9e5e942f20caf0fc96a73b5 Mon Sep 17 00:00:00 2001
+From 2f45f14f3393b7a978f9301599183a54c0d90ad5 Mon Sep 17 00:00:00 2001
From: Treeve Jelbert <treeve AT sourcemage.org>
Date: Thu, 7 Jan 2016 15:59:12 +0100
-Subject: [PATCH 1/4] use system libedit
+Subject: [PATCH 1/5] use system libedit

---
CMakeLists.txt | 2 +-
@@ -52,7 +52,7 @@ index 997589e..4a04c7a 100644
/* Define to 1 if you have the <errno.h> header file. */
#cmakedefine HAVE_ERRNO_H 1
diff --git a/src/isql/isql.epp b/src/isql/isql.epp
-index 98b37bb..3e90cd2 100644
+index e9d1eb6..71fc21f 100644
--- a/src/isql/isql.epp
+++ b/src/isql/isql.epp
@@ -78,10 +78,8 @@
@@ -87,5 +87,5 @@ index 98b37bb..3e90cd2 100644
{
// CVC: On 2005-04-02, use an empty prompt when not working in
--
-2.12.1
+2.12.2

diff --git a/database/firebird3/patches/0002-use-system-libtommath.patch
b/database/firebird3/patches/0002-use-system-libtommath.patch
index 8c46e9b..2e15ec8 100644
--- a/database/firebird3/patches/0002-use-system-libtommath.patch
+++ b/database/firebird3/patches/0002-use-system-libtommath.patch
@@ -1,7 +1,7 @@
-From cea04fe913b5308f1e684e983aad6e1fae274cfc Mon Sep 17 00:00:00 2001
+From 136edcfa28f08c7075a156bd60ae5d583b4dc5de Mon Sep 17 00:00:00 2001
From: Treeve Jelbert <treeve AT sourcemage.org>
Date: Sat, 24 Jan 2015 12:48:36 +0100
-Subject: [PATCH 2/4] use system libtommath
+Subject: [PATCH 2/5] use system libtommath

---
CMakeLists.txt | 5 -----
@@ -54,5 +54,5 @@ index 9ca8421..583c4c8 100644
PUBLIC ${LIB_readline}
PUBLIC ${LIB_dl}
--
-2.12.1
+2.12.2

diff --git a/database/firebird3/patches/0003-pcmet.epp-no-longer-exists.patch
b/database/firebird3/patches/0003-pcmet.epp-no-longer-exists.patch
index 2c203e3..d970798 100644
--- a/database/firebird3/patches/0003-pcmet.epp-no-longer-exists.patch
+++ b/database/firebird3/patches/0003-pcmet.epp-no-longer-exists.patch
@@ -1,7 +1,7 @@
-From 72ab3f3c38544459ee1f76300a83850f979e3676 Mon Sep 17 00:00:00 2001
+From ea2bd86c2cb55027b9104e0a05b444a78c6e4730 Mon Sep 17 00:00:00 2001
From: Treeve Jelbert <treeve AT sourcemage.org>
Date: Mon, 13 Jun 2016 20:44:30 +0200
-Subject: [PATCH 3/4] pcmet.epp no longer exists
+Subject: [PATCH 3/5] pcmet.epp no longer exists

---
src/CMakeLists.txt | 2 --
@@ -28,5 +28,5 @@ index 583c4c8..1344d1b 100644
utilities/gstat/dba.epp
)
--
-2.12.1
+2.12.2

diff --git a/database/firebird3/patches/0004-suppress-some-includes.patch
b/database/firebird3/patches/0004-suppress-some-includes.patch
index e4210d9..9696a64 100644
--- a/database/firebird3/patches/0004-suppress-some-includes.patch
+++ b/database/firebird3/patches/0004-suppress-some-includes.patch
@@ -1,7 +1,7 @@
-From 3c3ef1b7a9807a10c18797a7759dd6c2873729eb Mon Sep 17 00:00:00 2001
+From f5e848b35c485181c841591c0840f53123ed5a34 Mon Sep 17 00:00:00 2001
From: Treeve Jelbert <treeve AT sourcemage.org>
Date: Sat, 11 Feb 2017 14:56:02 +0100
-Subject: [PATCH 4/4] suppress some includes
+Subject: [PATCH 4/5] suppress some includes

---
CMakeLists.txt | 6 +++---
@@ -32,5 +32,5 @@ index edcce97..3be6969 100644
include_directories("src/include")
include_directories("src/include/gen")
--
-2.12.1
+2.12.2

diff --git
a/database/firebird3/patches/0005-cmake-fix-for-non-sse4.2-machine.patch
b/database/firebird3/patches/0005-cmake-fix-for-non-sse4.2-machine.patch
new file mode 100644
index 0000000..1a2bfbf
--- /dev/null
+++ b/database/firebird3/patches/0005-cmake-fix-for-non-sse4.2-machine.patch
@@ -0,0 +1,38 @@
+From 3333315b97704d0935ea2c513dd2a683fb473485 Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Sat, 1 Apr 2017 13:11:35 +0200
+Subject: [PATCH 5/5] cmake fix for non sse4.2 machine
+
+---
+ CMakeLists.txt | 2 +-
+ src/CMakeLists.txt | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3be6969..73020c6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -17,7 +17,7 @@
+ #
+
################################################################################
+
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 3.6)
+
+ # In-source builds are not possible and so disabled.
+ if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 1344d1b..6bc51de 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -369,6 +369,7 @@ if (APPLE)
+ endif()
+
+ add_library (common ${common_src} ${common_os_src}
${common_include})
++set_source_files_properties(common/CRC32C.cpp PROPERTIES COMPILE_FLAGS
-msse4)
+ target_link_libraries (common ${LIB_mpr})
+ add_dependencies_cc (common UpdateCloopInterfaces)
+
+--
+2.12.2
+
diff --git a/python-pypi/sqlalchemy/DETAILS b/python-pypi/sqlalchemy/DETAILS
index 4d8b82c..708d199 100755
--- a/python-pypi/sqlalchemy/DETAILS
+++ b/python-pypi/sqlalchemy/DETAILS
@@ -1,7 +1,7 @@
SPELL=sqlalchemy
CHEESESHOP_PKG=SQLAlchemy
- VERSION=1.1.6
-
VX=24/de/66d96cbad7a91443af1399469e9aa0aec8a41669ba6d0faae8b8411ddb27
+ VERSION=1.1.8
+
VX=b8/df/cf8fa190708f1b50144f185e1fcd63f25ec51dbe2e6240933ea7565c2e16
SOURCE="$CHEESESHOP_PKG-$VERSION.tar.gz"
SOURCE_URL[0]=https://pypi.python.org/packages/$VX/$SOURCE
SOURCE2=$SOURCE.asc
diff --git a/python-pypi/sqlalchemy/HISTORY b/python-pypi/sqlalchemy/HISTORY
index 401e4b5..13dddf1 100644
--- a/python-pypi/sqlalchemy/HISTORY
+++ b/python-pypi/sqlalchemy/HISTORY
@@ -1,3 +1,6 @@
+2017-04-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1.8
+
2017-02-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.1.6




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (4aba332c102aa6e685e7ff54f42344c725a1b03f), Treeve Jelbert, 04/01/2017

Archive powered by MHonArc 2.6.24.

Top of Page