Skip to Content.
Sympa Menu

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

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 (de6b0a49fdd9aaba2a4a1ea2017694a1033d6d1d)
  • Date: Fri, 8 Jul 2016 20:34:28 +0000

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

database/firebird3/DETAILS | 7 +---
database/firebird3/HISTORY | 4 ++
database/firebird3/fb.diff | 75
++++++++++++++++++++++++++++++++++++++++-----
3 files changed, 75 insertions(+), 11 deletions(-)

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

firebird3: => 3.0.0.32483-0

diff --git a/database/firebird3/DETAILS b/database/firebird3/DETAILS
index 2948f5a..f460ec1 100755
--- a/database/firebird3/DETAILS
+++ b/database/firebird3/DETAILS
@@ -1,10 +1,9 @@
SPELL=firebird3
SPELLX=Firebird
- VERSION=3.0
- VX=3.0.0.32483-0
+ VERSION=3.0.0.32483-0

SOURCE_HASH=sha512:17d170ce3ced3830a10fc7e517d5ef53d151c5affe9676485b7a860e94f68bbb5a003123fbcaa5fffc04b2d91aec161a8f3ef1ee2c0b197a8546904a4c6e6dee
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELLX}-${VX}
- SOURCE=${SPELLX}-$VX.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELLX}-${VERSION}
+ SOURCE=${SPELLX}-$VERSION.tar.bz2
# SOURCE_URL[0]=http://firebirdsql.org/download/prerelease/source/$SOURCE
SOURCE_URL[1]=$SOURCEFORGE_URL/firebird/$SOURCE
WEB_SITE=http://www.firebirdsql.org
diff --git a/database/firebird3/HISTORY b/database/firebird3/HISTORY
index 7deeffb..5ba8675 100644
--- a/database/firebird3/HISTORY
+++ b/database/firebird3/HISTORY
@@ -1,3 +1,7 @@
+2016-07-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.0.0.32483-0
+ * fb.diff: updated, including gcc-6.1 fixes
+
2016-04-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.0
* cmake.diff.gz: deleted
diff --git a/database/firebird3/fb.diff b/database/firebird3/fb.diff
index 4c62404..94e5692 100644
--- a/database/firebird3/fb.diff
+++ b/database/firebird3/fb.diff
@@ -1,7 +1,7 @@
-From 82b95ca7cfaec0962f02c4bebd55bf64047684c7 Mon Sep 17 00:00:00 2001
+From 2de228f763cafbf84a8a6cdffd29365e564bd6bf 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/2] 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 d313c0d..48a8255 100644
+index 8080e5a..58804f7 100644
--- a/src/isql/isql.epp
+++ b/src/isql/isql.epp
@@ -83,10 +83,8 @@
@@ -87,12 +87,12 @@ index d313c0d..48a8255 100644
{
// CVC: On 2005-04-02, use an empty prompt when not working in
--
-2.7.0
+2.9.0

-From 2e2b3191bfe752f3330128448c4951677ed882c2 Mon Sep 17 00:00:00 2001
+From a0f972018cb0bd822c2e14efffd2b031a89ae7af 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/2] use system libtommath
+Subject: [PATCH 2/5] use system libtommath

---
CMakeLists.txt | 1 -
@@ -134,5 +134,66 @@ index 9ca8421..583c4c8 100644
PUBLIC ${LIB_readline}
PUBLIC ${LIB_dl}
--
-2.7.0
+2.9.0
+
+From 12b92da3f6907c8132d0f5910bcfde399860bf32 Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Sat, 14 May 2016 08:58:15 +0200
+Subject: [PATCH 3/5] tommath--
+
+---
+ CMakeLists.txt | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 51f02be..edcce97 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -333,10 +333,6 @@
include_directories("${CMAKE_CURRENT_BINARY_DIR}/src/include/gen")
+ # LIBRARY libtommath
+ ########################################
+
+-file(GLOB libtommath_src "extern/libtommath/*.c" "extern/libtommath/*.h")
+-
+-add_library (libtommath ${libtommath_src})
+-project_group (libtommath Extern)
+
+ ########################################
+ # EXECUTABLE btyacc
+--
+2.9.0
+
+From 5239646b0ec413151511a71812043d1d55d6117a Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Mon, 13 Jun 2016 21:41:18 +0200
+Subject: [PATCH 5/5] fix build with gcc-6.1
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index edcce97..33c3d73 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -212,7 +212,7 @@ if (UNIX)
+ set(OS_DIR posix)
+
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -fno-sized-deallocation
-fno-delete-null-pointer-checks -flifetime-dse=1 -fcheck-new -Wno-narrowing")
+
+ if (NOT CMAKE_CROSSCOMPILING)
+ set(LIB_readline edit)
+@@ -242,7 +242,7 @@ if (APPLE)
+
+ find_library(LIB_CoreFoundation CoreFoundation)
+ elseif (UNIX)
+- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pthread")
++ set(CMAKE_EXE_LINKER_FLAGS " ${CMAKE_EXE_LINKER_FLAGS} -pthread ")
+ endif()
+
+
################################################################################
+--
+2.9.0




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (de6b0a49fdd9aaba2a4a1ea2017694a1033d6d1d), Treeve Jelbert, 07/08/2016

Archive powered by MHonArc 2.6.24.

Top of Page