firebird: update to 2.5.6 and fix gcc6 build
This commit is contained in:
parent
272432b26f
commit
95ebb8c5e7
19
srcpkgs/firebird/files/fix-gcc6-no_throw_bad_alloc.patch
Normal file
19
srcpkgs/firebird/files/fix-gcc6-no_throw_bad_alloc.patch
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
--- src/common/classes/alloc.h 2015-11-16 12:39:40.000000000 +0100
|
||||||
|
+++ src/common/classes/alloc.h 2016-09-14 14:28:38.810632773 +0200
|
||||||
|
@@ -49,14 +49,8 @@
|
||||||
|
stdlib.h (EKU) */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-// MSVC does not support exception specification, so it's unknown if that will be correct or not
|
||||||
|
-// from its POV. For now, use it and disable the C4290 warning.
|
||||||
|
-//
|
||||||
|
-//#if defined (_MSC_VER)
|
||||||
|
-//#define THROW_BAD_ALLOC
|
||||||
|
-//#else
|
||||||
|
-#define THROW_BAD_ALLOC throw (std::bad_alloc)
|
||||||
|
-//#endif
|
||||||
|
+// Handled by -fcheck-new compiler option
|
||||||
|
+#define THROW_BAD_ALLOC
|
||||||
|
|
||||||
|
#ifdef USE_VALGRIND
|
||||||
|
|
@ -1,7 +1,7 @@
|
|||||||
# Template file for 'firebird'
|
# Template file for 'firebird'
|
||||||
pkgname=firebird
|
pkgname=firebird
|
||||||
version=2.5.5.26952
|
version=2.5.6.27020
|
||||||
revision=4
|
revision=1
|
||||||
_build=0
|
_build=0
|
||||||
wrksrc="${pkgname^}-${version}-${_build}"
|
wrksrc="${pkgname^}-${version}-${_build}"
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
@ -14,9 +14,14 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
|
|||||||
license="custom"
|
license="custom"
|
||||||
homepage="http://www.firebirdsql.org/en/start/"
|
homepage="http://www.firebirdsql.org/en/start/"
|
||||||
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/${version%.*}-Release/${pkgname^}-${version}-${_build}.tar.bz2"
|
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/${version%.*}-Release/${pkgname^}-${version}-${_build}.tar.bz2"
|
||||||
checksum=b33e63ede88184d9ef2ae6760537ab75bfe641513821410b83e837946162b7d1
|
checksum=8e416f2f9a8f1fce2aa872925ca2016010878265ec56fe0a32a73e0080378826
|
||||||
disable_parallel_build=yes
|
disable_parallel_build=yes
|
||||||
|
|
||||||
|
_gccver=$(gcc --version | awk '/^gcc \(GCC\)/ { print $3 }')
|
||||||
|
if [ "${_gccver%%.*}" -gt 5 ]; then
|
||||||
|
CXXFLAGS="-Wno-error=narrowing -fcheck-new -fno-delete-null-pointer-checks -fno-lifetime-dse"
|
||||||
|
fi
|
||||||
|
|
||||||
pre_configure() {
|
pre_configure() {
|
||||||
# Avoid errors telling we are not 'root' and
|
# Avoid errors telling we are not 'root' and
|
||||||
# do not change ownership to root:root and
|
# do not change ownership to root:root and
|
||||||
@ -34,6 +39,11 @@ pre_configure() {
|
|||||||
|
|
||||||
# Set -fPIC for btyacc tool to support PIE linker flags
|
# Set -fPIC for btyacc tool to support PIE linker flags
|
||||||
sed -i extern/btyacc/Makefile -e 's;CFLAGS=;CFLAGS=-fPIC;'
|
sed -i extern/btyacc/Makefile -e 's;CFLAGS=;CFLAGS=-fPIC;'
|
||||||
|
|
||||||
|
if [ "${_gccver%%.*}" -gt 5 ]; then
|
||||||
|
# Fix gcc6 error for "void * operator new(size_t size) { return 0; }"
|
||||||
|
patch -p0 < ${FILESDIR}/fix-gcc6-no_throw_bad_alloc.patch
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
do_install() {
|
do_install() {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user