libbobcat: Update to 5.04.01
This commit is contained in:
Alexey Pavlov
parent
55e9a5038a
commit
de96254859
@ -2,7 +2,7 @@
|
||||
|
||||
pkgbase=libbobcat
|
||||
pkgname=('libbobcat' 'libbobcat-devel')
|
||||
pkgver=4.08.03
|
||||
pkgver=5.04.01
|
||||
pkgrel=1
|
||||
pkgdesc="Bobcat (Brokken's Own Base Classes And Templates) library"
|
||||
arch=('i686' 'x86_64')
|
||||
@ -14,23 +14,26 @@ optdepends=()
|
||||
# Use my own repo temporarily to avoid untaring soft link.
|
||||
source=("${pkgname}::git+https://gitlab.com/fbb-git/bobcat.git#tag=${pkgver}"
|
||||
"fix-g_errno.patch"
|
||||
"fix-build.patch")
|
||||
"fix-build.patch"
|
||||
"fix-light-build.patch")
|
||||
sha256sums=('SKIP'
|
||||
'fe1bedf6bbe255128aeab37215164022a029f2343bc29229e03e943501f3f73a'
|
||||
'43d44fc32f62836dcf47ea21b987af1e45ab2a3b0b13a9ea477b3331590d3b0d')
|
||||
'5d34da873571c5f864bbee8549427fb569bd692fbd68eb9ce2691d476cf68b15'
|
||||
'b2f2773d4486d4b2b3c3f6c20042a7eb3b01e7e2a75d5bd3b28761283b891d9d')
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}/${pkgname}"
|
||||
cd "${srcdir}/${pkgbase}"
|
||||
patch -p1 -i ${srcdir}/fix-g_errno.patch
|
||||
patch -p1 -i ${srcdir}/fix-build.patch
|
||||
patch -p1 -i ${srcdir}/fix-light-build.patch
|
||||
}
|
||||
build() {
|
||||
cd "${srcdir}/${pkgname}/bobcat"
|
||||
CXXFLAGS="$CXXFLAGS -std=c++14"
|
||||
cd "${srcdir}/${pkgbase}/bobcat"
|
||||
CXXFLAGS="$CXXFLAGS -std=c++17 -D_GNU_SOURCE"
|
||||
# Add the -P option not to use precompiled headers, which can be useful since
|
||||
# they require a lot of free space, compared to a normal compilation:
|
||||
# ./build -P libraries all
|
||||
./build -p light
|
||||
./build light
|
||||
./build man
|
||||
./build install x "${srcdir}/dest"
|
||||
|
||||
|
||||
@ -120,30 +120,6 @@ diff -Naur bobcat-4.07.00-1-orig/bobcat/icmake/libraries bobcat-4.07.00-1/bobcat
|
||||
|
||||
g_copt += " -fPIC";
|
||||
// adds option for shared lib
|
||||
diff -Naur bobcat-4.07.00-1-orig/bobcat/icmconf bobcat-4.07.00-1/bobcat/icmconf
|
||||
--- bobcat-4.07.00-1-orig/bobcat/icmconf 2017-05-31 12:04:01.000000000 +0300
|
||||
+++ bobcat-4.07.00-1/bobcat/icmconf 2017-06-01 13:37:48.168616200 +0300
|
||||
@@ -5,7 +5,7 @@
|
||||
#define THREAD ""
|
||||
#endif
|
||||
|
||||
-#define CXX "g++-8"
|
||||
+#define CXX "g++"
|
||||
|
||||
#define CXXFLAGS "--std=c++17 " ${THREAD} " -Wall -O2" \
|
||||
" -fdiagnostics-color=never "
|
||||
diff -Naur bobcat-4.07.00-1-orig/bobcat/INSTALL.im bobcat-4.07.00-1/bobcat/INSTALL.im
|
||||
--- bobcat-4.07.00-1-orig/bobcat/INSTALL.im 2017-05-31 12:04:01.000000000 +0300
|
||||
+++ bobcat-4.07.00-1/bobcat/INSTALL.im 2017-06-01 13:37:48.168616200 +0300
|
||||
@@ -17,7 +17,7 @@
|
||||
//===========================================================================
|
||||
|
||||
// The name of the C++ compiler
|
||||
-#define CXX "g++-8"
|
||||
+#define CXX "g++"
|
||||
|
||||
// Specify compiler options that should be used.
|
||||
// This is overruled by the environment variable CXXFLAGS
|
||||
diff -Naur bobcat-4.07.00-1-orig/bobcat/linearmap/driver/build bobcat-4.07.00-1/bobcat/linearmap/driver/build
|
||||
--- bobcat-4.07.00-1-orig/bobcat/linearmap/driver/build 2017-05-31 12:04:01.000000000 +0300
|
||||
+++ bobcat-4.07.00-1/bobcat/linearmap/driver/build 2017-06-01 13:37:48.168616200 +0300
|
||||
@ -174,41 +150,14 @@ diff -Naur bobcat-4.07.00-1-orig/bobcat/redirector/driver/build bobcat-4.07.00-1
|
||||
printf("ok: ", programname, "\n");
|
||||
}
|
||||
/*
|
||||
diff -Naur bobcat-4.07.00-1-orig/bobcat/syslogstream/driver/build bobcat-4.07.00-1/bobcat/syslogstream/driver/build
|
||||
--- bobcat-4.07.00-1-orig/bobcat/syslogstream/driver/build 2017-05-31 12:04:01.000000000 +0300
|
||||
+++ bobcat-4.07.00-1/bobcat/syslogstream/driver/build 2017-06-01 13:44:34.935265800 +0300
|
||||
@@ -408,10 +408,8 @@
|
||||
version;
|
||||
|
||||
version = strtok(BUILD_LIBRARY, ".");
|
||||
- libso = "lib" + library + ".so";
|
||||
- libxxx = libso + ".";
|
||||
- libsomajor = libxxx + element(0, version);
|
||||
- libxxx += BUILD_LIBRARY;
|
||||
+ libso = "lib" + library + ".dll.a";
|
||||
+ libxxx = "msys-" + library + ".dll";
|
||||
|
||||
for (index = 0; index < nClasses; index++)
|
||||
{
|
||||
@@ -428,7 +426,7 @@
|
||||
exec(COMPILER,
|
||||
gdb,
|
||||
"-shared",
|
||||
- "-Wl,-soname," + libsomajor,
|
||||
+ "-Wl,--out-implib," + libso,
|
||||
"-o", libxxx,
|
||||
ofiles,
|
||||
libs,
|
||||
@@ -445,12 +443,6 @@
|
||||
chdir(cwd); // go back to parent dir
|
||||
}
|
||||
|
||||
-
|
||||
- exec("ln", "-sf", libxxx, libsomajor);
|
||||
- printf("ok: ", libsomajor, "\n");
|
||||
-
|
||||
- exec("ln", "-sf", libsomajor, libso);
|
||||
- printf("ok: ", libso, "\n");
|
||||
#endif
|
||||
}
|
||||
/*
|
||||
diff -Naur a/bobcat/signal/signal b/bobcat/signal/signal
|
||||
--- a/bobcat/signal/signal 2017-05-31 12:04:01.000000000 +0300
|
||||
+++ b/bobcat/signal/signal 2017-06-01 13:37:48.168616200 +0300
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
#include <vector>
|
||||
#include <csignal>
|
||||
+#include <signal.h>
|
||||
|
||||
namespace FBB
|
||||
{
|
||||
|
||||
19
libbobcat/fix-light-build.patch
Normal file
19
libbobcat/fix-light-build.patch
Normal file
@ -0,0 +1,19 @@
|
||||
--- libbobcat/bobcat/CLASSES.orig 2020-04-20 16:24:39.415646700 +0300
|
||||
+++ libbobcat/bobcat/CLASSES 2020-04-20 16:25:17.450432400 +0300
|
||||
@@ -104,6 +104,5 @@
|
||||
typetrait
|
||||
user
|
||||
x2a
|
||||
-cryptbuf
|
||||
eoibuf
|
||||
eoi
|
||||
--- libbobcat/bobcat/SSLCLASSES.orig 2020-04-20 16:24:48.569034800 +0300
|
||||
+++ libbobcat/bobcat/SSLCLASSES 2020-04-20 16:25:33.020435300 +0300
|
||||
@@ -3,6 +3,7 @@
|
||||
pf_iterator
|
||||
pf_iteratorstream
|
||||
bigint
|
||||
+cryptbuf
|
||||
decryptbuf
|
||||
diffiehellman
|
||||
digestbuf
|
||||
Loading…
x
Reference in New Issue
Block a user