diff options
| author | Matěj Cepl <mcepl@redhat.com> | 2013-09-08 23:34:56 +0200 |
|---|---|---|
| committer | Matěj Cepl <mcepl@redhat.com> | 2013-09-08 23:34:56 +0200 |
| commit | f03c3eac2c17e730f4da66ac28acec978c18c20e (patch) | |
| tree | 12b88c8cf635478f1f163f177332bc43a0533d5e | |
| parent | aa233606dc5358292f26808439bd60836a9b5dfe (diff) | |
| download | pyg-f03c3eac2c17e730f4da66ac28acec978c18c20e.tar.gz | |
Ubuntu patches
http://patches.ubuntu.com/p/pyg/pyg_0.9.8ubuntu2.patch
| -rw-r--r-- | debian/changelog | 21 | ||||
| -rw-r--r-- | debian/control | 3 | ||||
| -rw-r--r-- | wlp/C/Makefile | 10 | ||||
| -rw-r--r-- | wlp/C/commands.l | 1 | ||||
| -rw-r--r-- | wlp/module/Makefile.pre.in | 1 |
5 files changed, 31 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 880d5ee..f53d92d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +pyg (0.9.8ubuntu2) raring; urgency=low + + * Fix build failure with python in multiarch location. + + -- Matthias Klose <doko@ubuntu.com> Mon, 08 Apr 2013 18:40:05 +0200 + +pyg (0.9.8ubuntu1) raring; urgency=low + + * Merge from Debian unstable. Remaining changes: + - adapt /wlp/C/Makefile for multiarched libfl.a + - include required string.h in wlp/C/commands.l + + -- Logan Rosen <logatronico@gmail.com> Mon, 26 Nov 2012 17:28:37 -0500 + pyg (0.9.8) unstable; urgency=low * Added string.h to avoid implicit declarations in yacc definitions. @@ -9,6 +23,13 @@ pyg (0.9.8) unstable; urgency=low -- Cosimo Alfarano <kalfa@debian.org> Tue, 02 Oct 2012 14:04:01 +0100 +pyg (0.9.7ubuntu1) quantal; urgency=low + + * adapt /wlp/C/Makefile for multiarched libfl.a + * include required string.h in wlp/C/commands.{l,y} + + -- Julian Taylor <jtaylor@ubuntu.com> Mon, 01 Oct 2012 21:10:48 +0200 + pyg (0.9.7) unstable; urgency=low * Added maildrop as a possible deps (Closes: #385771) diff --git a/debian/control b/debian/control index d956b52..40c52a5 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,8 @@ Source: pyg Section: news Priority: optional -Maintainer: Cosimo Alfarano <kalfa@debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Cosimo Alfarano <kalfa@debian.org> Standards-Version: 3.9.3 Build-Depends: debhelper (>= 3.0), python-dev (>= 2.6.6-3~), flex, bison diff --git a/wlp/C/Makefile b/wlp/C/Makefile index 961690d..5581888 100644 --- a/wlp/C/Makefile +++ b/wlp/C/Makefile @@ -17,21 +17,23 @@ LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) SRCDIR=. BINDIR=. +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + OBJFILE=structs.o commands.tab.o lex.yy.o all: archive bin # archive file for python module -archive: structs bison flex /usr/lib/libfl.a macro.h structs.h commands.tab.h +archive: structs bison flex macro.h structs.h commands.tab.h $(AR) $(AROPTS) $(BINDIR)/wlp.a $(OBJFILE) \ - /usr/lib/libfl.a + /usr/lib/$(DEB_HOST_MULTIARCH)/libfl.a # binary (executable) file for testing executable: bin -bin: structs bison flex /usr/lib/libfl.a macro.h structs.h commands.tab.h +bin: structs bison flex macro.h structs.h commands.tab.h $(CC) $(CCSHARED) $(CCOPTS) $(OBJFILE) \ - yytest.c /usr/lib/libfl.a -o ./yytest + yytest.c /usr/lib/$(DEB_HOST_MULTIARCH)/libfl.a -o ./yytest flex: $(FLEX) $(FLEXOPTS) commands.l diff --git a/wlp/C/commands.l b/wlp/C/commands.l index 8f0f28e..ab954cf 100644 --- a/wlp/C/commands.l +++ b/wlp/C/commands.l @@ -4,6 +4,7 @@ #include "commands.tab.h" /*#define DEBUG*/ #include "macro.h" +#include <string.h> %} OWNER "<"[a-zA-Z0-9_.+-]+@[a-zA-Z0-9._-]+">" diff --git a/wlp/module/Makefile.pre.in b/wlp/module/Makefile.pre.in index fce3177..1026fc5 100644 --- a/wlp/module/Makefile.pre.in +++ b/wlp/module/Makefile.pre.in @@ -166,6 +166,7 @@ LIBP= $(exec_installdir)/lib/python$(VERSION) DESTSHARED= $(BINLIBDEST)/site-packages LIBPL= $(LIBP)/config +LIBPL= $(shell python$(VERSION)-config --configdir) PYTHONLIBS= $(LIBPL)/libpython$(VERSION).a |