[Pkg-corba-commits] r226 - /trunk/python-omniorb/debian/patches/pydebug
flub-guest at users.alioth.debian.org
flub-guest at users.alioth.debian.org
Wed Feb 2 22:33:43 UTC 2011
Author: flub-guest
Date: Wed Feb 2 22:33:43 2011
New Revision: 226
URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=226
Log:
Update patch to not depend on debian-specific python extensions.
Modified:
trunk/python-omniorb/debian/patches/pydebug
Modified: trunk/python-omniorb/debian/patches/pydebug
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/python-omniorb/debian/patches/pydebug?rev=226&op=diff
==============================================================================
--- trunk/python-omniorb/debian/patches/pydebug (original)
+++ trunk/python-omniorb/debian/patches/pydebug Wed Feb 2 22:33:43 2011
@@ -8,169 +8,149 @@
--- a/examples/embed/dir.mk
+++ b/examples/embed/dir.mk
-@@ -15,9 +15,15 @@
- ifdef UnixPlatform
+@@ -16,8 +16,11 @@
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
++PYINCBASE := $(shell $(PYTHON) -c 'import distutils.sysconfig, os.path; print os.path.basename(distutils.sysconfig.get_config_var("INCLUDEPY"))')
++PY_SHAREDLIB_SUFFIX := $(shell $(PYTHON) -c 'import distutils.sysconfig; print distutils.sysconfig.get_config_var("SHLIB_EXT")')
++
PYINCDIR := $(PYPREFIX)/include
-PYINCFILE := "<python$(PYVERSION)/Python.h>"
-+PYINCFILE := "<python$(PYVERSION)$(PYDEBUG)/Python.h>"
++PYINCFILE := "<$(PYINCBASE)/Python.h>"
DIR_CPPFLAGS += -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE)
endif
-@@ -26,9 +32,9 @@
+@@ -26,9 +29,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)
++SharedLibraryFullNameTemplate = $$1$$2$(PY_SHAREDLIB_SUFFIX).$$3.$$4
++SharedLibrarySoNameTemplate = $$1$$2$(PY_SHAREDLIB_SUFFIX).$$3
++SharedLibraryLibNameTemplate = $$1$$2$(PY_SHAREDLIB_SUFFIX)
ifdef PythonLibraryPlatformLinkFlagsTemplate
SharedLibraryPlatformLinkFlagsTemplate = $(PythonLibraryPlatformLinkFlagsTemplate)
--- a/modules/codesets/dir.mk
+++ b/modules/codesets/dir.mk
-@@ -21,10 +21,16 @@
- #CXXDEBUGFLAGS = -g
+@@ -22,9 +22,12 @@
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
++PYINCBASE := $(shell $(PYTHON) -c 'import distutils.sysconfig, os.path; print os.path.basename(distutils.sysconfig.get_config_var("INCLUDEPY"))')
++PY_SHAREDLIB_SUFFIX := $(shell $(PYTHON) -c 'import distutils.sysconfig; print distutils.sysconfig.get_config_var("SHLIB_EXT")')
++
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>"
++PYINCFILE := "<$(PYINCBASE)/Python.h>"
++PYINCTHRD := "<$(PYINCBASE)/pythread.h>"
DIR_CPPFLAGS += -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD)
DIR_CPPFLAGS += $(CORBA_CPPFLAGS)
-@@ -43,9 +49,9 @@
+@@ -43,9 +46,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)
++SharedLibraryFullNameTemplate = $$1$$2$(PY_SHAREDLIB_SUFFIX).$$3.$$4
++SharedLibrarySoNameTemplate = $$1$$2$(PY_SHAREDLIB_SUFFIX).$$3
++SharedLibraryLibNameTemplate = $$1$$2$(PY_SHAREDLIB_SUFFIX)
ifdef PythonLibraryPlatformLinkFlagsTemplate
SharedLibraryPlatformLinkFlagsTemplate = $(PythonLibraryPlatformLinkFlagsTemplate)
--- a/modules/connections/dir.mk
+++ b/modules/connections/dir.mk
-@@ -19,10 +19,16 @@
- #CXXDEBUGFLAGS = -g
+@@ -20,9 +20,12 @@
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
++PYINCBASE := $(shell $(PYTHON) -c 'import distutils.sysconfig, os.path; print os.path.basename(distutils.sysconfig.get_config_var("INCLUDEPY"))')
++PY_SHAREDLIB_SUFFIX := $(shell $(PYTHON) -c 'import distutils.sysconfig; print distutils.sysconfig.get_config_var("SHLIB_EXT")')
++
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>"
++PYINCFILE := "<$(PYINCBASE)/Python.h>"
++PYINCTHRD := "<$(PYINCBASE)/pythread.h>"
DIR_CPPFLAGS += -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD)
DIR_CPPFLAGS += $(CORBA_CPPFLAGS)
-@@ -50,9 +56,9 @@
+@@ -50,9 +53,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)
++SharedLibraryFullNameTemplate = $$1$$2$(PY_SHAREDLIB_SUFFIX).$$3.$$4
++SharedLibrarySoNameTemplate = $$1$$2$(PY_SHAREDLIB_SUFFIX).$$3
++SharedLibraryLibNameTemplate = $$1$$2$(PY_SHAREDLIB_SUFFIX)
ifdef PythonLibraryPlatformLinkFlagsTemplate
SharedLibraryPlatformLinkFlagsTemplate = $(PythonLibraryPlatformLinkFlagsTemplate)
--- a/modules/dir.mk
+++ b/modules/dir.mk
-@@ -72,10 +72,16 @@
- #CXXDEBUGFLAGS = -g
+@@ -73,9 +73,12 @@
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
++PYINCBASE := $(shell $(PYTHON) -c 'import distutils.sysconfig, os.path; print os.path.basename(distutils.sysconfig.get_config_var("INCLUDEPY"))')
++PY_SHAREDLIB_SUFFIX := $(shell $(PYTHON) -c 'import distutils.sysconfig; print distutils.sysconfig.get_config_var("SHLIB_EXT")')
++
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>"
++PYINCFILE := "<$(PYINCBASE)/Python.h>"
++PYINCTHRD := "<$(PYINCBASE)/pythread.h>"
DIR_CPPFLAGS += -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD)
DIR_CPPFLAGS += $(CORBA_CPPFLAGS)
-@@ -94,9 +100,9 @@
+@@ -94,9 +97,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)
++SharedLibraryFullNameTemplate = $$1$$2$(PY_SHAREDLIB_SUFFIX).$$3.$$4
++SharedLibrarySoNameTemplate = $$1$$2$(PY_SHAREDLIB_SUFFIX).$$3
++SharedLibraryLibNameTemplate = $$1$$2$(PY_SHAREDLIB_SUFFIX)
ifdef PythonLibraryPlatformLinkFlagsTemplate
SharedLibraryPlatformLinkFlagsTemplate = $(PythonLibraryPlatformLinkFlagsTemplate)
--- a/modules/sslTP/dir.mk
+++ b/modules/sslTP/dir.mk
-@@ -20,10 +20,16 @@
- #CXXDEBUGFLAGS = -g
+@@ -21,9 +21,12 @@
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
++PYINCBASE := $(shell $(PYTHON) -c 'import distutils.sysconfig, os.path; print os.path.basename(distutils.sysconfig.get_config_var("INCLUDEPY"))')
++PY_SHAREDLIB_SUFFIX := $(shell $(PYTHON) -c 'import distutils.sysconfig; print distutils.sysconfig.get_config_var("SHLIB_EXT")')
++
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>"
++PYINCFILE := "<$(PYINCBASE)/Python.h>"
++PYINCTHRD := "<$(PYINCBASE)/pythread.h>"
DIR_CPPFLAGS += -I$(PYINCDIR) -DPYTHON_INCLUDE=$(PYINCFILE) -DPYTHON_THREAD_INC=$(PYINCTHRD)
DIR_CPPFLAGS += $(CORBA_CPPFLAGS)
-@@ -45,9 +51,9 @@
+@@ -45,9 +48,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)
++SharedLibraryFullNameTemplate = $$1$$2$(PY_SHAREDLIB_SUFFIX).$$3.$$4
++SharedLibrarySoNameTemplate = $$1$$2$(PY_SHAREDLIB_SUFFIX).$$3
++SharedLibraryLibNameTemplate = $$1$$2$(PY_SHAREDLIB_SUFFIX)
ifdef PythonLibraryPlatformLinkFlagsTemplate
SharedLibraryPlatformLinkFlagsTemplate = $(PythonLibraryPlatformLinkFlagsTemplate)
More information about the Pkg-corba-commits
mailing list