Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7591 from Rmys/master

Browse Source 
firefird:ver. bump
This commit is contained in:
Rmys
2020-01-16 23:14:28 +03:00
committed by GitHub
parent 3b1a13c2c0 6cd38fbc72
commit fe9e302eaa
2 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/database/firebird/actions.py
+5 -9
View File
@@ -15,31 +15,27 @@ WorkDir="Firebird-%s-0" % get.srcVERSION()
def setup():
shelltools.export("CFLAGS", "%s -fno-strict-aliasing" % get.CFLAGS())
#shelltools.export("CXXFLAGS", "%s -std=gnu++98 -fno-lifetime-dse" % get.CXXFLAGS())
shelltools.export("CXXFLAGS", "%s -fno-lifetime-dse" % get.CXXFLAGS())
shelltools.export("CXXFLAGS", "%s -fno-lifetime-dse -Wno-error=narrowing" % get.CXXFLAGS())
pisitools.dosed("src/isql/isql.epp", '"isql\s', '"fbsql ')
pisitools.dosed("src/msgs/history2.sql", 'isql\s', 'fbsql ')
pisitools.dosed("src/msgs/messages2.sql", 'isql\s', 'fbsql ')
pisitools.dosed("src/msgs/messages2.sql", 'ISQL\s', 'FBSQL ')
#pisitools.dosed("src/jrd/perf.h", '#include <libio.h>', '')
shelltools.system("find ./ -name \*.sh -print0 | xargs -0 chmod +x")
for d in ("btyacc", "editline", "icu"):
shelltools.unlinkDir("extern/%s" % d)
#for d in ("btyacc", "editline", "icu"):
#shelltools.unlinkDir("extern/%s" % d)
shelltools.system("sh autogen.sh")
autotools.autoreconf("-fi")
autotools.configure("--prefix=/opt/firebird \
--disable-static \
--enable-superserver \
--with-editline \
--with-gnu-ld \
--with-system-editline \
--with-system-icu \
")
def build():
#Parallel build is broken
#shelltools.export("CXXFLAGS", "%s -std=gnu++98 -fno-lifetime-dse" % get.CXXFLAGS())
shelltools.export("CXXFLAGS", "%s -fno-lifetime-dse" % get.CXXFLAGS())
shelltools.export("CXXFLAGS", "%s -fno-lifetime-dse -Wno-error=narrowing" % get.CXXFLAGS())
autotools.make("-j1")
shelltools.cd("gen")
pisitools.dosed("install/makeInstallImage.sh", "exit 1", "# exit 1")
server/database/firebird/pspec.xml
+17 -6
View File
@@ -15,7 +15,7 @@
<IsA>library</IsA>
<Summary>A relational database offering many ANSI SQL-99 features</Summary>
<Description>Firebird is an open source relational database management system offering many ANSI SQL-99 features.</Description>
<Archive sha1sum="39ed55321ea1a18c525e3100301ac57a53c59423" type="tarbz2">http://sourceforge.net/projects/firebird/files/firebird/2.5.7-Release/Firebird-2.5.7.27050-0.tar.bz2</Archive>
<Archive sha1sum="715845c29e391c4f75d090d400f9550095411404" type="targz">https://github.com/FirebirdSQL/firebird/archive/R2_5_9.tar.gz</Archive>
<BuildDependencies>
<Dependency>icu4c-devel</Dependency>
<Dependency>btyacc</Dependency>
@@ -28,14 +28,14 @@
<Patch level="1">fix-lib64-dir.diff</Patch>
<Patch level="1">firebird-2.5.1-svn-CORE-3610.patch</Patch>-->
<!--Patch level="1">editline-dumb-tr.patch</Patch-->
<Patch level="1">firebird-c++11.patch</Patch>
<Patch level="1">firebird-c++14.patch</Patch>
<Patch level="1">firebird-2.5.1.26351.0-deps-flags.patch</Patch>
<!-- <Patch level="1">firebird-c++11.patch</Patch> -->
<!-- <Patch level="1">firebird-c++14.patch</Patch> -->
<!-- <Patch level="1">firebird-2.5.1.26351.0-deps-flags.patch</Patch> -->
<!--Patch level="1">Provide-sized-global-delete-operators-when-compiled.patch</Patch>
<Patch level="1">Make-the-generated-code-compatible-with-gcc-6-in-C-1.patch</Patch>
<Patch level="1">Firebird-gcc-icu.patch</Patch-->
<Patch>006-musl-glibc.patch</Patch>
<Patch>007-libio.patch</Patch>
<!-- <Patch>006-musl-glibc.patch</Patch> -->
<!-- <Patch>007-libio.patch</Patch> -->
</Patches>
</Source>
@@ -55,6 +55,10 @@
<Path fileType="library">/opt/firebird/lib/libgds.*</Path>
<Path fileType="library">/opt/firebird/lib/libib_util.*</Path>
<Path fileType="library">/opt/firebird/plugins/libfbtrace.so</Path>
<Path fileType="library">/usr/lib/libicuuc.so*</Path>
<Path fileType="library">/usr/lib/libicudata.so*</Path>
<Path fileType="library">/usr/lib/libicui18n.so*</Path>
<Path fileType="library">/usr/lib/libfbembed.so*</Path>
</Files>
</Package>
@@ -109,6 +113,13 @@
</Package>
<History>
<Update release="7">
<Date>2020-01-16</Date>
<Version>2.5.9.27139</Version>
<Comment>Version bump.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="6">
<Date>2020-01-16</Date>
<Version>2.5.7.27050</Version>