1 |
polynomial-c 12/01/31 06:17:38 |
2 |
|
3 |
Added: dos2unix-5.3.1-fix_debug_build.patch |
4 |
dos2unix-5.3.2-fix_debug_build.patch |
5 |
Log: |
6 |
Version bump. Removed old. Fixed debug build with patch from upstream (bug #400769) |
7 |
|
8 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 app-text/dos2unix/files/dos2unix-5.3.1-fix_debug_build.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/dos2unix/files/dos2unix-5.3.1-fix_debug_build.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/dos2unix/files/dos2unix-5.3.1-fix_debug_build.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: dos2unix-5.3.1-fix_debug_build.patch |
17 |
=================================================================== |
18 |
--- dos2unix-5.3.1/dos2unix.c |
19 |
+++ dos2unix-5.3.1/dos2unix.c |
20 |
@@ -60,8 +60,6 @@ |
21 |
*/ |
22 |
|
23 |
|
24 |
-#define VER_AUTHOR "Erwin Waterlander" |
25 |
- |
26 |
/* #define DEBUG 1 */ |
27 |
|
28 |
#include "common.h" |
29 |
--- dos2unix-5.3.1/Makefile |
30 |
+++ dos2unix-5.3.1/Makefile |
31 |
@@ -194,9 +194,14 @@ |
32 |
|
33 |
EXTRA_CFLAGS = -DVER_REVISION=\"$(DOS2UNIX_VERSION)\" \ |
34 |
-DVER_DATE=\"$(DOS2UNIX_DATE)\" \ |
35 |
+ -DVER_AUTHOR=\"$(DOS2UNIX_AUTHOR)\" \ |
36 |
-DDEBUG=$(DEBUG) \ |
37 |
$(CFLAGS_OS) |
38 |
|
39 |
+ifeq ($(DEBUG), 1) |
40 |
+ EXTRA_CFLAGS += -g |
41 |
+endif |
42 |
+ |
43 |
ifdef STATIC |
44 |
EXTRA_CFLAGS += -static |
45 |
endif |
46 |
--- dos2unix-5.3.1/unix2dos.c |
47 |
+++ dos2unix-5.3.1/unix2dos.c |
48 |
@@ -50,8 +50,6 @@ |
49 |
*/ |
50 |
|
51 |
|
52 |
-#define VER_AUTHOR "Erwin Waterlander" |
53 |
- |
54 |
/* #define DEBUG 1 */ |
55 |
|
56 |
#include "common.h" |
57 |
--- dos2unix-5.3.1/version.mk |
58 |
+++ dos2unix-5.3.1/version.mk |
59 |
@@ -1,3 +1,4 @@ |
60 |
DOS2UNIX_VERSION = 5.3.1 |
61 |
DOS2UNIX_VERSION_SHORT = 531 |
62 |
DOS2UNIX_DATE = 2011-08-09 |
63 |
+DOS2UNIX_AUTHOR = 'Erwin Waterlander' |
64 |
|
65 |
|
66 |
|
67 |
1.1 app-text/dos2unix/files/dos2unix-5.3.2-fix_debug_build.patch |
68 |
|
69 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/dos2unix/files/dos2unix-5.3.2-fix_debug_build.patch?rev=1.1&view=markup |
70 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/dos2unix/files/dos2unix-5.3.2-fix_debug_build.patch?rev=1.1&content-type=text/plain |
71 |
|
72 |
Index: dos2unix-5.3.2-fix_debug_build.patch |
73 |
=================================================================== |
74 |
Index: Makefile |
75 |
=================================================================== |
76 |
--- Makefile (revision 349) |
77 |
+++ Makefile (working copy) |
78 |
@@ -204,9 +204,14 @@ |
79 |
|
80 |
EXTRA_CFLAGS = -DVER_REVISION=\"$(DOS2UNIX_VERSION)\" \ |
81 |
-DVER_DATE=\"$(DOS2UNIX_DATE)\" \ |
82 |
+ -DVER_AUTHOR=\"$(DOS2UNIX_AUTHOR)\" \ |
83 |
-DDEBUG=$(DEBUG) \ |
84 |
$(CFLAGS_OS) |
85 |
|
86 |
+ifeq ($(DEBUG), 1) |
87 |
+ EXTRA_CFLAGS += -g |
88 |
+endif |
89 |
+ |
90 |
ifdef STATIC |
91 |
EXTRA_CFLAGS += -static |
92 |
endif |
93 |
Index: dos2unix.c |
94 |
=================================================================== |
95 |
--- dos2unix.c (revision 347) |
96 |
+++ dos2unix.c (working copy) |
97 |
@@ -60,8 +60,6 @@ |
98 |
*/ |
99 |
|
100 |
|
101 |
-#define VER_AUTHOR "Erwin Waterlander" |
102 |
- |
103 |
/* #define DEBUG 1 */ |
104 |
|
105 |
#include "common.h" |
106 |
Index: unix2dos.c |
107 |
=================================================================== |
108 |
--- unix2dos.c (revision 347) |
109 |
+++ unix2dos.c (working copy) |
110 |
@@ -50,8 +50,6 @@ |
111 |
*/ |
112 |
|
113 |
|
114 |
-#define VER_AUTHOR "Erwin Waterlander" |
115 |
- |
116 |
/* #define DEBUG 1 */ |
117 |
|
118 |
#include "common.h" |
119 |
Index: version.mk |
120 |
=================================================================== |
121 |
--- version.mk (revision 347) |
122 |
+++ version.mk (working copy) |
123 |
@@ -1,3 +1,4 @@ |
124 |
DOS2UNIX_VERSION = 5.3.2 |
125 |
DOS2UNIX_VERSION_SHORT = 532 |
126 |
DOS2UNIX_DATE = 2012-01-27 |
127 |
+DOS2UNIX_AUTHOR = 'Erwin Waterlander' |