1 |
nyhm 09/01/22 18:12:53 |
2 |
|
3 |
Added: revelation-0.4.11-build.patch |
4 |
Log: |
5 |
Depend on the split gnome-python packages, bug #248786; respect CFLAGS/LDFLAGS |
6 |
(Portage version: 2.2_rc23/cvs/Linux i686) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 x11-misc/revelation/files/revelation-0.4.11-build.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/revelation/files/revelation-0.4.11-build.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/revelation/files/revelation-0.4.11-build.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: revelation-0.4.11-build.patch |
15 |
=================================================================== |
16 |
--- acinclude.m4 |
17 |
+++ acinclude.m4 |
18 |
@@ -83,7 +83,6 @@ |
19 |
AC_DEFUN([RVL_PYGTK], [ |
20 |
PKG_CHECK_MODULES(PYGTK, [pygtk-2.0 >= 2.8.0]) |
21 |
PKG_CHECK_MODULES(GNOME_PYTHON, [gnome-python-2.0 >= 2.10.0]) |
22 |
- PKG_CHECK_MODULES(GNOME_PYTHON_EXTRAS, [gnome-python-extras-2.0 >= 2.10.0]) |
23 |
|
24 |
AC_PATH_PROG(PYGTK_CODEGEN, pygtk-codegen-2.0, no) |
25 |
|
26 |
--- configure.ac |
27 |
+++ configure.ac |
28 |
@@ -12,6 +12,7 @@ |
29 |
|
30 |
dnl check for dependencies |
31 |
AC_PROG_CC() |
32 |
+AC_PROG_LIBTOOL |
33 |
|
34 |
RVL_PYTHON_PATH(2.3) |
35 |
RVL_PYGTK() |
36 |
--- src/wrap/crack/crack.c |
37 |
+++ src/wrap/crack/crack.c |
38 |
@@ -24,8 +24,6 @@ |
39 |
|
40 |
#define FILENAME_MAXLEN 512 |
41 |
|
42 |
-static char DEFAULT_DICTPATH[] = "/usr/local/share/revelation/pwdict"; |
43 |
- |
44 |
static char crack_FascistCheck_doc [] = |
45 |
"arguments: passwd, dictpath (optional)\n" |
46 |
"\n" |
47 |
--- src/wrap/crack/Makefile.am |
48 |
+++ src/wrap/crack/Makefile.am |
49 |
@@ -5,19 +5,9 @@ |
50 |
# $Id: revelation-0.4.11-build.patch,v 1.1 2009/01/22 18:12:53 nyhm Exp $ |
51 |
# |
52 |
|
53 |
-module_PROGRAMS = crack.so |
54 |
moduledir = $(pyexecdir)/revelation |
55 |
-CLEANFILES = crack.c |
56 |
-EXTRA_DIST = crack.c.in |
57 |
- |
58 |
-crack.c: crack.c.in |
59 |
- sed \ |
60 |
- -e "s|\@CRACK_DICTPATH\@|@CRACK_DICTPATH@|" \ |
61 |
- crack.c.in >crack.c |
62 |
- |
63 |
-crack.o: crack.c |
64 |
- $(CC) -pthread -fno-strict-aliasing -fPIC -I${PYTHON_INCLUDE} -c crack.c -o crack.o |
65 |
- |
66 |
-crack.so: crack.o |
67 |
- $(CC) -Wl --export-dynamic -pthread -shared crack.o -lcrack -o crack.so |
68 |
- |
69 |
+module_LTLIBRARIES = crack.la |
70 |
+crack_la_SOURCES = crack.c |
71 |
+crack_la_CFLAGS = -Wall |
72 |
+crack_la_CPPFLAGS = -I$(PYTHON_INCLUDE) -DDEFAULT_DICTPATH="\"$(CRACK_DICTPATH)\"" |
73 |
+crack_la_LDFLAGS = -module |