Archives
Archives
| From: | "Tim Harder (radhermit)" <radhermit@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in app-forensics/afflib/files: afflib-3.6.12-python-module.patch afflib-3.6.12-pyaff-header.patch |
| Date: | Mon, 28 Nov 2011 05:42:09 |
| Message-Id: | 20111128054156.E71992004C@flycatcher.gentoo.org |
| 1 | radhermit 11/11/28 05:41:56 |
| 2 | |
| 3 | Modified: afflib-3.6.12-python-module.patch |
| 4 | Added: afflib-3.6.12-pyaff-header.patch |
| 5 | Log: |
| 6 | Fix autotools-utils usage (bug #392137). Fix python module CFLAGS handling. |
| 7 | |
| 8 | (Portage version: 2.2.0_alpha77/cvs/Linux x86_64) |
| 9 | |
| 10 | Revision Changes Path |
| 11 | 1.3 app-forensics/afflib/files/afflib-3.6.12-python-module.patch |
| 12 | |
| 13 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-forensics/afflib/files/afflib-3.6.12-python-module.patch?rev=1.3&view=markup |
| 14 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-forensics/afflib/files/afflib-3.6.12-python-module.patch?rev=1.3&content-type=text/plain |
| 15 | diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-forensics/afflib/files/afflib-3.6.12-python-module.patch?r1=1.2&r2=1.3 |
| 16 | |
| 17 | Index: afflib-3.6.12-python-module.patch |
| 18 | =================================================================== |
| 19 | RCS file: /var/cvsroot/gentoo-x86/app-forensics/afflib/files/afflib-3.6.12-python-module.patch,v |
| 20 | retrieving revision 1.2 |
| 21 | retrieving revision 1.3 |
| 22 | diff -u -r1.2 -r1.3 |
| 23 | --- afflib-3.6.12-python-module.patch 26 Nov 2011 01:33:33 -0000 1.2 |
| 24 | +++ afflib-3.6.12-python-module.patch 28 Nov 2011 05:41:56 -0000 1.3 |
| 25 | @@ -1,3 +1,5 @@ |
| 26 | +Only build the shared python library. |
| 27 | + |
| 28 | --- afflib-3.6.12/pyaff/Makefile.am.orig |
| 29 | +++ afflib-3.6.12/pyaff/Makefile.am |
| 30 | @@ -7,7 +7,8 @@ |
| 31 | @@ -8,6 +10,6 @@ |
| 32 | +pyaff_la_LIBADD = @top_builddir@/lib/libafflib.la |
| 33 | pyaff_la_CPPFLAGS = $(PYTHON_CPPFLAGS) |
| 34 | -pyaff_la_LDFLAGS = -module -avoid-version $(PYTHON_LDFLAGS) |
| 35 | -+pyaff_la_CFLAGS = -shared |
| 36 | ++pyaff_la_CFLAGS = $(AM_CFLAGS) -shared |
| 37 | +pyaff_la_LDFLAGS = -module -avoid-version -shared $(PYTHON_LDFLAGS) |
| 38 | endif |
| 39 | |
| 40 | |
| 41 | |
| 42 | 1.1 app-forensics/afflib/files/afflib-3.6.12-pyaff-header.patch |
| 43 | |
| 44 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-forensics/afflib/files/afflib-3.6.12-pyaff-header.patch?rev=1.1&view=markup |
| 45 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-forensics/afflib/files/afflib-3.6.12-pyaff-header.patch?rev=1.1&content-type=text/plain |
| 46 | |
| 47 | Index: afflib-3.6.12-pyaff-header.patch |
| 48 | =================================================================== |
| 49 | Fix include location based on the include directories passed via CFLAGS. |
| 50 | |
| 51 | --- afflib-3.6.12/pyaff/pyaff.c.orig |
| 52 | +++ afflib-3.6.12/pyaff/pyaff.c |
| 53 | @@ -21,7 +21,7 @@ |
| 54 | ****************************************************/ |
| 55 | |
| 56 | #include "Python.h" |
| 57 | -#include "lib/afflib.h" |
| 58 | +#include "afflib.h" |
| 59 | |
| 60 | #include <string.h> |
| 61 | #include <stdlib.h> |