update to postgresql-plv8 1.4.2 and add patches to fix with pgsql 9.4;
remove jeremy@ as maintainer per his request. ok jeremy@
This commit is contained in:
sthen
parent
dc69be6808
commit
37b15ab3c4
@ -1,34 +1,33 @@
|
||||
# $OpenBSD: Makefile,v 1.4 2013/10/15 02:19:18 jeremy Exp $
|
||||
# $OpenBSD: Makefile,v 1.5 2015/01/08 15:03:35 sthen Exp $
|
||||
|
||||
# v8 only works on these arches currently
|
||||
ONLY_FOR_ARCHS = amd64 i386
|
||||
|
||||
COMMENT = PostgreSQL V8 javascript procedual language
|
||||
|
||||
VERSION = 1.3.0
|
||||
VERSION = 1.4.2
|
||||
DISTNAME = plv8-${VERSION}
|
||||
REVISION = 1
|
||||
PKGNAME = postgresql-${DISTNAME}
|
||||
|
||||
CATEGORIES = databases
|
||||
|
||||
HOMEPAGE = https://code.google.com/p/plv8js
|
||||
|
||||
MAINTAINER = Jeremy Evans <jeremy@openbsd.org>
|
||||
|
||||
# BSD
|
||||
PERMIT_PACKAGE_CDROM = Yes
|
||||
|
||||
WANTLIB = c m stdc++ v8 execinfo pthread
|
||||
WANTLIB = c m stdc++ pthread v8
|
||||
|
||||
MASTER_SITES = http://api.pgxn.org/dist/plv8/${VERSION}/
|
||||
EXTRACT_SUFX = .zip
|
||||
|
||||
BUILD_DEPENDS = ${RUN_DEPENDS}
|
||||
LIB_DEPENDS = lang/libv8
|
||||
RUN_DEPENDS = postgresql-server->=9.3,<9.4:databases/postgresql,-server
|
||||
RUN_DEPENDS = postgresql-server->=9.4,<9.5:databases/postgresql,-server
|
||||
|
||||
MAKE_FLAGS = V8DIR=${LOCALBASE}/lib
|
||||
MAKE_FLAGS = V8DIR=${LOCALBASE}/lib \
|
||||
CUSTOM_CC="${CXX}" \
|
||||
OPTFLAGS="${CXXFLAGS}"
|
||||
USE_GMAKE = Yes
|
||||
|
||||
# Need to start the PostgreSQL server first
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (plv8-1.3.0.zip) = jN4PamVjpC9ip0PYzOI7OMaM/tR3YOnuCZGRj4a2sU8=
|
||||
SIZE (plv8-1.3.0.zip) = 156064
|
||||
SHA256 (plv8-1.4.2.zip) = kRo+Enc6N9J0PkEnU1JWa/b928SSohBzqo1Ep80LFcA=
|
||||
SIZE (plv8-1.4.2.zip) = 163808
|
||||
|
||||
115
databases/postgresql-plv8/patches/patch-plv8_cc
Normal file
115
databases/postgresql-plv8/patches/patch-plv8_cc
Normal file
@ -0,0 +1,115 @@
|
||||
$OpenBSD: patch-plv8_cc,v 1.1 2015/01/08 15:03:35 sthen Exp $
|
||||
|
||||
https://code.google.com/p/plv8js/source/detail?r=094df45dce2a879d1814b792aeb46b38f0f0ef87&name=r1.4
|
||||
|
||||
--- plv8.cc.orig Wed Dec 24 18:18:58 2014
|
||||
+++ plv8.cc Wed Dec 24 18:20:58 2014
|
||||
@@ -47,22 +47,12 @@ PG_FUNCTION_INFO_V1(plcoffee_call_validator);
|
||||
PG_FUNCTION_INFO_V1(plls_call_handler);
|
||||
PG_FUNCTION_INFO_V1(plls_call_validator);
|
||||
|
||||
-Datum plv8_call_handler(PG_FUNCTION_ARGS) throw();
|
||||
-Datum plv8_call_validator(PG_FUNCTION_ARGS) throw();
|
||||
-Datum plcoffee_call_handler(PG_FUNCTION_ARGS) throw();
|
||||
-Datum plcoffee_call_validator(PG_FUNCTION_ARGS) throw();
|
||||
-Datum plls_call_handler(PG_FUNCTION_ARGS) throw();
|
||||
-Datum plls_call_validator(PG_FUNCTION_ARGS) throw();
|
||||
-
|
||||
void _PG_init(void);
|
||||
|
||||
#if PG_VERSION_NUM >= 90000
|
||||
PG_FUNCTION_INFO_V1(plv8_inline_handler);
|
||||
PG_FUNCTION_INFO_V1(plcoffee_inline_handler);
|
||||
PG_FUNCTION_INFO_V1(plls_inline_handler);
|
||||
-Datum plv8_inline_handler(PG_FUNCTION_ARGS) throw();
|
||||
-Datum plcoffee_inline_handler(PG_FUNCTION_ARGS) throw();
|
||||
-Datum plls_inline_handler(PG_FUNCTION_ARGS) throw();
|
||||
#endif
|
||||
} // extern "C"
|
||||
|
||||
@@ -307,26 +297,26 @@ common_pl_call_handler(PG_FUNCTION_ARGS, Dialect diale
|
||||
}
|
||||
|
||||
Datum
|
||||
-plv8_call_handler(PG_FUNCTION_ARGS) throw()
|
||||
+plv8_call_handler(PG_FUNCTION_ARGS)
|
||||
{
|
||||
return common_pl_call_handler(fcinfo, PLV8_DIALECT_NONE);
|
||||
}
|
||||
|
||||
Datum
|
||||
-plcoffee_call_handler(PG_FUNCTION_ARGS) throw()
|
||||
+plcoffee_call_handler(PG_FUNCTION_ARGS)
|
||||
{
|
||||
return common_pl_call_handler(fcinfo, PLV8_DIALECT_COFFEE);
|
||||
}
|
||||
|
||||
Datum
|
||||
-plls_call_handler(PG_FUNCTION_ARGS) throw()
|
||||
+plls_call_handler(PG_FUNCTION_ARGS)
|
||||
{
|
||||
return common_pl_call_handler(fcinfo, PLV8_DIALECT_LIVESCRIPT);
|
||||
}
|
||||
|
||||
#if PG_VERSION_NUM >= 90000
|
||||
static Datum
|
||||
-common_pl_inline_handler(PG_FUNCTION_ARGS, Dialect dialect) throw()
|
||||
+common_pl_inline_handler(PG_FUNCTION_ARGS, Dialect dialect)
|
||||
{
|
||||
InlineCodeBlock *codeblock = (InlineCodeBlock *) DatumGetPointer(PG_GETARG_DATUM(0));
|
||||
|
||||
@@ -354,19 +344,19 @@ common_pl_inline_handler(PG_FUNCTION_ARGS, Dialect dia
|
||||
}
|
||||
|
||||
Datum
|
||||
-plv8_inline_handler(PG_FUNCTION_ARGS) throw()
|
||||
+plv8_inline_handler(PG_FUNCTION_ARGS)
|
||||
{
|
||||
return common_pl_inline_handler(fcinfo, PLV8_DIALECT_NONE);
|
||||
}
|
||||
|
||||
Datum
|
||||
-plcoffee_inline_handler(PG_FUNCTION_ARGS) throw()
|
||||
+plcoffee_inline_handler(PG_FUNCTION_ARGS)
|
||||
{
|
||||
return common_pl_inline_handler(fcinfo, PLV8_DIALECT_COFFEE);
|
||||
}
|
||||
|
||||
Datum
|
||||
-plls_inline_handler(PG_FUNCTION_ARGS) throw()
|
||||
+plls_inline_handler(PG_FUNCTION_ARGS)
|
||||
{
|
||||
return common_pl_inline_handler(fcinfo, PLV8_DIALECT_LIVESCRIPT);
|
||||
}
|
||||
@@ -688,7 +678,7 @@ CallTrigger(PG_FUNCTION_ARGS, plv8_exec_env *xenv)
|
||||
}
|
||||
|
||||
static Datum
|
||||
-common_pl_call_validator(PG_FUNCTION_ARGS, Dialect dialect) throw()
|
||||
+common_pl_call_validator(PG_FUNCTION_ARGS, Dialect dialect)
|
||||
{
|
||||
Oid fn_oid = PG_GETARG_OID(0);
|
||||
HeapTuple tuple;
|
||||
@@ -746,19 +736,19 @@ common_pl_call_validator(PG_FUNCTION_ARGS, Dialect dia
|
||||
}
|
||||
|
||||
Datum
|
||||
-plv8_call_validator(PG_FUNCTION_ARGS) throw()
|
||||
+plv8_call_validator(PG_FUNCTION_ARGS)
|
||||
{
|
||||
return common_pl_call_validator(fcinfo, PLV8_DIALECT_NONE);
|
||||
}
|
||||
|
||||
Datum
|
||||
-plcoffee_call_validator(PG_FUNCTION_ARGS) throw()
|
||||
+plcoffee_call_validator(PG_FUNCTION_ARGS)
|
||||
{
|
||||
return common_pl_call_validator(fcinfo, PLV8_DIALECT_COFFEE);
|
||||
}
|
||||
|
||||
Datum
|
||||
-plls_call_validator(PG_FUNCTION_ARGS) throw()
|
||||
+plls_call_validator(PG_FUNCTION_ARGS)
|
||||
{
|
||||
return common_pl_call_validator(fcinfo, PLV8_DIALECT_LIVESCRIPT);
|
||||
}
|
||||
18
databases/postgresql-plv8/patches/patch-plv8_func_cc
Normal file
18
databases/postgresql-plv8/patches/patch-plv8_func_cc
Normal file
@ -0,0 +1,18 @@
|
||||
$OpenBSD: patch-plv8_func_cc,v 1.1 2015/01/08 15:03:35 sthen Exp $
|
||||
|
||||
https://code.google.com/p/plv8js/source/detail?r=0bf77f3c5e2ee7d47da426b1963cd887b97e7d61&name=r1.4
|
||||
|
||||
--- plv8_func.cc.orig Wed Dec 24 18:24:15 2014
|
||||
+++ plv8_func.cc Wed Dec 24 18:24:49 2014
|
||||
@@ -518,7 +518,11 @@ plv8_Prepare(const Arguments &args)
|
||||
CString typestr(array->Get(i));
|
||||
int32 typemod;
|
||||
|
||||
+#if PG_VERSION_NUM >= 90400
|
||||
+ parseTypeString(typestr, &types[i], &typemod, false);
|
||||
+#else
|
||||
parseTypeString(typestr, &types[i], &typemod);
|
||||
+#endif
|
||||
}
|
||||
|
||||
PG_TRY();
|
||||
@ -1,9 +1,9 @@
|
||||
@comment $OpenBSD: PLIST,v 1.1.1.1 2012/12/20 16:16:34 jeremy Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.2 2015/01/08 15:03:35 sthen Exp $
|
||||
lib/postgresql/plv8.so
|
||||
share/doc/pkg-readmes/${FULLPKGNAME}
|
||||
share/postgresql/extension/plcoffee--1.3.0.sql
|
||||
share/postgresql/extension/plcoffee--1.4.2.sql
|
||||
share/postgresql/extension/plcoffee.control
|
||||
share/postgresql/extension/plls--1.3.0.sql
|
||||
share/postgresql/extension/plls--1.4.2.sql
|
||||
share/postgresql/extension/plls.control
|
||||
share/postgresql/extension/plv8--1.3.0.sql
|
||||
share/postgresql/extension/plv8--1.4.2.sql
|
||||
share/postgresql/extension/plv8.control
|
||||
|
||||
Loading…
Reference in New Issue
Block a user