[Pkg-corba-commits] r208 - in /trunk/python-omniorb: examples/embed/dir.mk modules/codesets/dir.mk modules/connections/dir.mk modules/dir.mk modules/sslTP/dir.mk
flub-guest at users.alioth.debian.org
flub-guest at users.alioth.debian.org
Sun Jan 10 13:00:39 UTC 2010
Author: flub-guest
Date: Sun Jan 10 13:00:34 2010
New Revision: 208
URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=208
Log:
Support building for PYDEBUG build, patch submitted upstream.
Modified:
trunk/python-omniorb/examples/embed/dir.mk
trunk/python-omniorb/modules/codesets/dir.mk
trunk/python-omniorb/modules/connections/dir.mk
trunk/python-omniorb/modules/dir.mk
trunk/python-omniorb/modules/sslTP/dir.mk
Modified: trunk/python-omniorb/examples/embed/dir.mk
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/python-omniorb/examples/embed/dir.mk?rev=208&op=diff
==============================================================================
--- trunk/python-omniorb/examples/embed/dir.mk (original)
+++ trunk/python-omniorb/examples/embed/dir.mk Sun Jan 10 13:00:34 2010
@@ -15,9 +15,15 @@
ifdef UnixPlatform
CXXDEBUGFLAGS = -g
PYPREFIX := $(shell $(PYTHON) -c 'import sys; print sys.exec_prefix')
+PYDEBUG := $(shell $(PYTHON) -c 'import sys; print sys.pydebug')
PYVERSION := $(shell $(PYTHON) -c 'import sys; print sys.version[:3]')
+ifeq ($(PYDEBUG),True)
+PYDEBUG := _d
+else
+PYDEBUG :=
+endif
PYINCDIR := $(PYPREFIX)/include
-PYINCFILE := "<python$(PYVERSION)/Python.h>"
+PYINCFILE := "<python$(PYVERSION)$(PYDEBUG)/Python.h>"
DIR_CPPFLAGS += -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE)
endif
@@ -26,9 +32,9 @@
namespec := _embedmodule _ 1 0
-SharedLibraryFullNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3.$$4
-SharedLibrarySoNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3
-SharedLibraryLibNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX)
+SharedLibraryFullNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3.$$4
+SharedLibrarySoNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3
+SharedLibraryLibNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX)
ifdef PythonLibraryPlatformLinkFlagsTemplate
SharedLibraryPlatformLinkFlagsTemplate = $(PythonLibraryPlatformLinkFlagsTemplate)
Modified: trunk/python-omniorb/modules/codesets/dir.mk
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/python-omniorb/modules/codesets/dir.mk?rev=208&op=diff
==============================================================================
--- trunk/python-omniorb/modules/codesets/dir.mk (original)
+++ trunk/python-omniorb/modules/codesets/dir.mk Sun Jan 10 13:00:34 2010
@@ -21,10 +21,16 @@
#CXXDEBUGFLAGS = -g
PYPREFIX := $(shell $(PYTHON) -c 'import sys; print sys.exec_prefix')
+PYDEBUG := $(shell $(PYTHON) -c 'import sys; print sys.pydebug')
PYVERSION := $(shell $(PYTHON) -c 'import sys; print sys.version[:3]')
+ifeq ($(PYDEBUG),True)
+PYDEBUG := _d
+else
+PYDEBUG :=
+endif
PYINCDIR := $(PYPREFIX)/include
-PYINCFILE := "<python$(PYVERSION)/Python.h>"
-PYINCTHRD := "<python$(PYVERSION)/pythread.h>"
+PYINCFILE := "<python$(PYVERSION)$(PYDEBUG)/Python.h>"
+PYINCTHRD := "<python$(PYVERSION)$(PYDEBUG)/pythread.h>"
DIR_CPPFLAGS += -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD)
DIR_CPPFLAGS += $(CORBA_CPPFLAGS)
@@ -43,9 +49,9 @@
SHAREDLIB_SUFFIX = $(PythonSHAREDLIB_SUFFIX)
endif
-SharedLibraryFullNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3.$$4
-SharedLibrarySoNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3
-SharedLibraryLibNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX)
+SharedLibraryFullNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3.$$4
+SharedLibrarySoNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3
+SharedLibraryLibNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX)
ifdef PythonLibraryPlatformLinkFlagsTemplate
SharedLibraryPlatformLinkFlagsTemplate = $(PythonLibraryPlatformLinkFlagsTemplate)
Modified: trunk/python-omniorb/modules/connections/dir.mk
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/python-omniorb/modules/connections/dir.mk?rev=208&op=diff
==============================================================================
--- trunk/python-omniorb/modules/connections/dir.mk (original)
+++ trunk/python-omniorb/modules/connections/dir.mk Sun Jan 10 13:00:34 2010
@@ -19,10 +19,16 @@
#CXXDEBUGFLAGS = -g
PYPREFIX := $(shell $(PYTHON) -c 'import sys; print sys.exec_prefix')
+PYDEBUG := $(shell $(PYTHON) -c 'import sys; print sys.pydebug')
PYVERSION := $(shell $(PYTHON) -c 'import sys; print sys.version[:3]')
+ifeq ($(PYDEBUG),True)
+PYDEBUG := _d
+else
+PYDEBUG :=
+endif
PYINCDIR := $(PYPREFIX)/include
-PYINCFILE := "<python$(PYVERSION)/Python.h>"
-PYINCTHRD := "<python$(PYVERSION)/pythread.h>"
+PYINCFILE := "<python$(PYVERSION)$(PYDEBUG)/Python.h>"
+PYINCTHRD := "<python$(PYVERSION)$(PYDEBUG)/pythread.h>"
DIR_CPPFLAGS += -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD)
DIR_CPPFLAGS += $(CORBA_CPPFLAGS)
@@ -50,9 +56,9 @@
SHAREDLIB_SUFFIX = $(PythonSHAREDLIB_SUFFIX)
endif
-SharedLibraryFullNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3.$$4
-SharedLibrarySoNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3
-SharedLibraryLibNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX)
+SharedLibraryFullNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3.$$4
+SharedLibrarySoNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3
+SharedLibraryLibNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX)
ifdef PythonLibraryPlatformLinkFlagsTemplate
SharedLibraryPlatformLinkFlagsTemplate = $(PythonLibraryPlatformLinkFlagsTemplate)
Modified: trunk/python-omniorb/modules/dir.mk
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/python-omniorb/modules/dir.mk?rev=208&op=diff
==============================================================================
--- trunk/python-omniorb/modules/dir.mk (original)
+++ trunk/python-omniorb/modules/dir.mk Sun Jan 10 13:00:34 2010
@@ -72,10 +72,16 @@
#CXXDEBUGFLAGS = -g
PYPREFIX := $(shell $(PYTHON) -c 'import sys; print sys.exec_prefix')
+PYDEBUG := $(shell $(PYTHON) -c 'import sys; print sys.pydebug')
PYVERSION := $(shell $(PYTHON) -c 'import sys; print sys.version[:3]')
+ifeq ($(PYDEBUG),True)
+PYDEBUG := _d
+else
+PYDEBUG :=
+endif
PYINCDIR := $(PYPREFIX)/include
-PYINCFILE := "<python$(PYVERSION)/Python.h>"
-PYINCTHRD := "<python$(PYVERSION)/pythread.h>"
+PYINCFILE := "<python$(PYVERSION)$(PYDEBUG)/Python.h>"
+PYINCTHRD := "<python$(PYVERSION)$(PYDEBUG)/pythread.h>"
DIR_CPPFLAGS += -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD)
DIR_CPPFLAGS += $(CORBA_CPPFLAGS)
@@ -94,9 +100,9 @@
SHAREDLIB_SUFFIX = $(PythonSHAREDLIB_SUFFIX)
endif
-SharedLibraryFullNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3.$$4
-SharedLibrarySoNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3
-SharedLibraryLibNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX)
+SharedLibraryFullNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3.$$4
+SharedLibrarySoNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3
+SharedLibraryLibNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX)
ifdef PythonLibraryPlatformLinkFlagsTemplate
SharedLibraryPlatformLinkFlagsTemplate = $(PythonLibraryPlatformLinkFlagsTemplate)
Modified: trunk/python-omniorb/modules/sslTP/dir.mk
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/python-omniorb/modules/sslTP/dir.mk?rev=208&op=diff
==============================================================================
--- trunk/python-omniorb/modules/sslTP/dir.mk (original)
+++ trunk/python-omniorb/modules/sslTP/dir.mk Sun Jan 10 13:00:34 2010
@@ -20,10 +20,16 @@
#CXXDEBUGFLAGS = -g
PYPREFIX := $(shell $(PYTHON) -c 'import sys; print sys.exec_prefix')
+PYDEBUG := $(shell $(PYTHON) -c 'import sys; print sys.pydebug')
PYVERSION := $(shell $(PYTHON) -c 'import sys; print sys.version[:3]')
+ifeq ($(PYDEBUG),True)
+PYDEBUG := _d
+else
+PYDEBUG :=
+endif
PYINCDIR := $(PYPREFIX)/include
-PYINCFILE := "<python$(PYVERSION)/Python.h>"
-PYINCTHRD := "<python$(PYVERSION)/pythread.h>"
+PYINCFILE := "<python$(PYVERSION)$(PYDEBUG)/Python.h>"
+PYINCTHRD := "<python$(PYVERSION)$(PYDEBUG)/pythread.h>"
DIR_CPPFLAGS += -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD)
DIR_CPPFLAGS += $(CORBA_CPPFLAGS)
@@ -45,9 +51,9 @@
SHAREDLIB_SUFFIX = $(PythonSHAREDLIB_SUFFIX)
endif
-SharedLibraryFullNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3.$$4
-SharedLibrarySoNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX).$$3
-SharedLibraryLibNameTemplate = $$1$$2.$(SHAREDLIB_SUFFIX)
+SharedLibraryFullNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3.$$4
+SharedLibrarySoNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX).$$3
+SharedLibraryLibNameTemplate = $$1$$2$(PYDEBUG).$(SHAREDLIB_SUFFIX)
ifdef PythonLibraryPlatformLinkFlagsTemplate
SharedLibraryPlatformLinkFlagsTemplate = $(PythonLibraryPlatformLinkFlagsTemplate)
More information about the Pkg-corba-commits
mailing list