diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | 0001_v8_sandbox_enable.patch | 10 | ||||
| -rw-r--r-- | PKGBUILD | 36 |
4 files changed, 39 insertions, 18 deletions
@@ -1,14 +1,15 @@ pkgbase = cbang-git pkgdesc = A library of cross-platform C++ utilities - pkgver = 1.3.2.r75.g0f1fb56 + pkgver = r1582.6e74d7ac pkgrel = 1 url = https://github.com/CauldronDevelopmentLLC/cbang arch = x86_64 license = LGPL2.1 - checkdepends = python2 + checkdepends = python + checkdepends = python-six makedepends = git makedepends = scons - depends = v8-6.8 + depends = v8-r depends = libevent depends = sqlite depends = re2 @@ -20,7 +21,8 @@ pkgbase = cbang-git provides = cbang conflicts = cbang source = git+https://github.com/CauldronDevelopmentLLC/cbang.git + source = 0001_v8_sandbox_enable.patch sha256sums = SKIP + sha256sums = 75eff0bcd04293990f8dfb0771562356ccac2a7f40a06df0c0ba515fcdf4126a pkgname = cbang-git - diff --git a/.gitignore b/.gitignore index 018a3de08144..7735b4612827 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ !PKGBUILD !.SRCINFO !.gitignore +!*.patch diff --git a/0001_v8_sandbox_enable.patch b/0001_v8_sandbox_enable.patch new file mode 100644 index 000000000000..86591baf212a --- /dev/null +++ b/0001_v8_sandbox_enable.patch @@ -0,0 +1,10 @@ +diff -ruN a/src/cbang/js/v8/V8.h b/src/cbang/js/v8/V8.h +--- a/src/cbang/js/v8/V8.h 2023-04-12 13:01:26.846888687 -0400 ++++ b/src/cbang/js/v8/V8.h 2023-04-12 13:02:23.030223080 -0400 +@@ -41,5 +41,6 @@ + #define V8STDINT_H_ + + #define V8_ENABLE_CHECKS ++#define V8_ENABLE_SANDBOX + + #include <v8.h> @@ -2,14 +2,14 @@ # Contributor: greyltc pkgname=cbang-git -pkgver=1.3.2.r75.g0f1fb56 +pkgver=r1582.6e74d7ac pkgrel=1 pkgdesc="A library of cross-platform C++ utilities" arch=('x86_64') url="https://github.com/CauldronDevelopmentLLC/cbang" license=('LGPL2.1') depends=( - 'v8-6.8' + 'v8-r' 'libevent' 'sqlite' 're2' @@ -23,41 +23,49 @@ makedepends=( 'scons' ) checkdepends=( - 'python2' + 'python' + 'python-six' ) optdepends=( 'mariadb-libs: MariaDB database support' ) conflicts=("${pkgname%-git}") provides=("${pkgname%-git}") -source=("git+https://github.com/CauldronDevelopmentLLC/cbang.git") -sha256sums=('SKIP') +#_commit="58d2cb5cbce2e1d4e71cc7bbac65a49ddb6e40fe" +#source=("git+https://github.com/CauldronDevelopmentLLC/cbang.git#commit=$_commit" +source=("git+https://github.com/CauldronDevelopmentLLC/cbang.git" + "0001_v8_sandbox_enable.patch") +sha256sums=('SKIP' + '75eff0bcd04293990f8dfb0771562356ccac2a7f40a06df0c0ba515fcdf4126a') pkgver() { cd "${pkgname%-git}" - git describe --long --tags | sed 's/^v//;s/-/.r/;s/-/./' + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } prepare() { cd "${pkgname%-git}" - sed -i "20i\ conf.CBRequireLib('v8_libplatform')" config/v8/__init__.py + patch -p1 -i "../0001_v8_sandbox_enable.patch" } build() { cd "${pkgname%-git}" - scons disable_local="libevent sqlite3 re2 libyaml zlib bzip2 expat" + scons cxxstd="c++17" disable_local="libevent sqlite3 re2 libyaml zlib bzip2 expat" } -#check() { -# cd "${pkgname%-git}/tests" -# scons -# python2 ./testHarness -#} +check() { + cd "${pkgname%-git}/tests" + scons cxxstd="c++17" disable_local="libevent sqlite3 re2 libyaml zlib bzip2 expat" + python ./testHarness +} package() { cd "${pkgname%-git}" - scons install prefix="$pkgdir/opt/${pkgname%-git}" + scons install cxxstd="c++17" prefix="$pkgdir/opt/${pkgname%-git}" + install -m644 lib/libcbang.a -t "$pkgdir/opt/${pkgname%-git}/lib" install -m644 lib/libcbang-boost.a -t "$pkgdir/opt/${pkgname%-git}/lib" cp -a config/ "$pkgdir/opt/${pkgname%-git}/config/" cp -a src/boost/boost/ "$pkgdir/opt/${pkgname%-git}/include/" + cp -a include/cbang/ "$pkgdir/opt/${pkgname%-git}/include/" + cp -a src/cbang/boost/ "$pkgdir/opt/${pkgname%-git}/include/cbang/" } |