Commit06a8346

committed

See attached for a small patch that enables plpython to build cleanly

under Cygwin. This patch together with my previous Python patch:http://postgresql.readysetnet.com/mhonarc/pgsql-patches/2001-05/msg00075.htmlenables full Python support (i.e., configure --with-python) for CygwinPostgreSQL.Jason Tishler

1 parentf6923ff commit06a8346Copy full SHA for 06a8346

File tree

+13

-6

lines changed

+13

-6

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# $Header: /cvsroot/pgsql/src/makefiles/Attic/Makefile.win,v 1.12 2001/05/2514:28:58 momjian Exp $`
	`1`	`+# $Header: /cvsroot/pgsql/src/makefiles/Attic/Makefile.win,v 1.13 2001/05/2515:48:33 momjian Exp $`
`2`	`2`	`LDFLAGS+= -g`
`3`	`3`	`DLLTOOL= dlltool`
`4`	`4`	`DLLWRAP= dllwrap`
`@@ -28,4 +28,8 @@ ifeq ($(findstring ecpg/lib,$(subdir)), ecpg/lib)`
`28`	`28`	`override CPPFLAGS+= -DBUILDING_DLL=1`
`29`	`29`	`endif`
`30`	`30`
	`31`	`+ifeq ($(findstring src/pl/plpython,$(subdir)), src/pl/plpython)`
	`32`	`+override CPPFLAGS+= -DUSE_DL_IMPORT`
	`33`	`+endif`
	`34`	`+`
`31`	`35`	`override javadir := '$(shell cygpath -w $(javadir))'`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# $Header: /cvsroot/pgsql/src/pl/plpython/Makefile,v 1.6 2001/05/14 22:06:50 petere Exp $`
	`1`	`+# $Header: /cvsroot/pgsql/src/pl/plpython/Makefile,v 1.7 2001/05/25 15:48:33 momjian Exp $`
`2`	`2`
`3`	`3`	`subdir = src/pl/plpython`
`4`	`4`	`top_builddir = ../../..`
`@@ -7,6 +7,8 @@ include $(top_builddir)/src/Makefile.global`
`7`	`7`
`8`	`8`	`overrideCPPFLAGS := -I$(srcdir) -I$(python_includedir)$(CPPFLAGS)`
`9`	`9`
	`10`	`+overrideDLLLIBS :=$(BE_DLLLIBS)$(DLLLIBS)`
	`11`	`+`
`10`	`12`	`NAME = plpython`
`11`	`13`	`SO_MAJOR_VERSION = 0`
`12`	`14`	`SO_MINOR_VERSION = 0`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ SELECT global_test_two();`
`29`	`29`	`(1 row)`
`30`	`30`
`31`	`31`	`SELECT import_fail();`
`32`		`-NOTICE: ('import socket failed -- untrusted dynamic module:socket',)`
	`32`	`+NOTICE: ('import socket failed -- untrusted dynamic module:_socket',)`
`33`	`33`	`import_fail`
`34`	`34`	`--------------------`
`35`	`35`	`failed as expected`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $Header: /cvsroot/pgsql/src/pl/plpython/plpython.c,v 1.2 2001/05/12 01:30:30 petere Exp $ */`
	`1`	`+/* $Header: /cvsroot/pgsql/src/pl/plpython/plpython.c,v 1.3 2001/05/25 15:48:33 momjian Exp $ */`
`2`	`2`
`3`	`3`	`/*`
`4`	`4`	`* plpython.c - python as a procedural language for PostgreSQL`
`@@ -1534,7 +1534,7 @@ static PyObject PLy_spi_execute_fetch_result(SPITupleTable , int, int);`
`1534`	`1534`
`1535`	`1535`
`1536`	`1536`	`PyTypeObjectPLy_PlanType= {`
`1537`		`-PyObject_HEAD_INIT(&PyType_Type)`
	`1537`	`+PyObject_HEAD_INIT(NULL)`
`1538`	`1538`	`0,/ob_size/`
`1539`	`1539`	`"PLyPlan",/tp_name/`
`1540`	`1540`	`sizeof(PLyPlanObject),/tp_size/`
`@@ -1577,7 +1577,7 @@ PySequenceMethods PLy_result_as_sequence = {`
`1577`	`1577`	`};`
`1578`	`1578`
`1579`	`1579`	`PyTypeObjectPLy_ResultType= {`
`1580`		`-PyObject_HEAD_INIT(&PyType_Type)`
	`1580`	`+PyObject_HEAD_INIT(NULL)`
`1581`	`1581`	`0,/ob_size/`
`1582`	`1582`	`"PLyResult",/tp_name/`
`1583`	`1583`	`sizeof(PLyResultObject),/tp_size/`
`@@ -2287,6 +2287,7 @@ PLy_init_plpy(void)`
`2287`	`2287`
`2288`	`2288`	`/* initialize plpy module`
`2289`	`2289`	`*/`
	`2290`	`+PLy_PlanType.ob_type=PLy_ResultType.ob_type=&PyType_Type;`
`2290`	`2291`	`plpy=Py_InitModule("plpy",PLy_methods);`
`2291`	`2292`	`plpy_dict=PyModule_GetDict(plpy);`
`2292`	`2293`

Comments

(0)