| 1 |
binki 12/01/12 00:35:32 |
| 2 |
|
| 3 |
Added: anope-1.8.7-mariadb.patch |
| 4 |
Log: |
| 5 |
Fix compilation with =mariadb-5.2*, bug #381119 reported by Flameeyes with patch from Adam from upstream. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha82-r1/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-irc/anope/files/anope-1.8.7-mariadb.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/anope/files/anope-1.8.7-mariadb.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/anope/files/anope-1.8.7-mariadb.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: anope-1.8.7-mariadb.patch |
| 16 |
=================================================================== |
| 17 |
Author: Adam |
| 18 |
Date: 2012-01-11 |
| 19 |
Subject: Fix https://bugs.gentoo.org/381119 , where -I ordering causes |
| 20 |
mariadb's services.h to be #include-ed improperly. |
| 21 |
|
| 22 |
diff --git a/src/Makefile b/src/Makefile |
| 23 |
index 739c918..a9a2ee2 100644 |
| 24 |
--- a/src/Makefile |
| 25 |
+++ b/src/Makefile |
| 26 |
@@ -25,7 +25,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \ |
| 27 |
'RDB=${RDB}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}' |
| 28 |
|
| 29 |
.c.o: |
| 30 |
- $(CC) $(CFLAGS) -I../include/ -c $< |
| 31 |
+ $(CC) -I../include/ $(CFLAGS) -c $< |
| 32 |
|
| 33 |
all: services |
| 34 |
|
| 35 |
diff --git a/src/core/Makefile b/src/core/Makefile |
| 36 |
index 4ec2754..32c049f 100644 |
| 37 |
--- a/src/core/Makefile |
| 38 |
+++ b/src/core/Makefile |
| 39 |
@@ -21,7 +21,7 @@ install: |
| 40 |
distclean: spotless |
| 41 |
|
| 42 |
.c.o: |
| 43 |
- $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $< |
| 44 |
+ $(CC) -I../${INCLUDEDIR} ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -c $< |
| 45 |
|
| 46 |
.o.s: |
| 47 |
$(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE} |
| 48 |
diff --git a/src/core/Makefile.sub b/src/core/Makefile.sub |
| 49 |
index 9fbadf3..d93e6d5 100644 |
| 50 |
--- a/src/core/Makefile.sub |
| 51 |
+++ b/src/core/Makefile.sub |
| 52 |
@@ -16,7 +16,7 @@ module: $(OBJECTS) so |
| 53 |
distclean: spotless |
| 54 |
|
| 55 |
.c.o: |
| 56 |
- $(CC) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -c $< |
| 57 |
+ $(CC) -I../ -I../../${INCLUDEDIR} ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -c $< |
| 58 |
|
| 59 |
so: |
| 60 |
$(CC) ${SHARED} $(OBJECTS) -o ../$(TARGET).so ${PROFILE} |
| 61 |
diff --git a/src/modules/Makefile b/src/modules/Makefile |
| 62 |
index cafbe45..bde65b3 100644 |
| 63 |
--- a/src/modules/Makefile |
| 64 |
+++ b/src/modules/Makefile |
| 65 |
@@ -24,7 +24,7 @@ install: |
| 66 |
distclean: spotless |
| 67 |
|
| 68 |
.c.o: |
| 69 |
- $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $< |
| 70 |
+ $(CC) -I../${INCLUDEDIR} ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -c $< |
| 71 |
|
| 72 |
.o.s: |
| 73 |
$(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE} |
| 74 |
diff --git a/src/modules/Makefile.sub b/src/modules/Makefile.sub |
| 75 |
index 7697249..b7c244f 100644 |
| 76 |
--- a/src/modules/Makefile.sub |
| 77 |
+++ b/src/modules/Makefile.sub |
| 78 |
@@ -16,7 +16,7 @@ module: $(OBJECTS) so |
| 79 |
distclean: spotless |
| 80 |
|
| 81 |
.c.o: |
| 82 |
- $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -c $< |
| 83 |
+ $(CC) -I../ -I../../${INCLUDEDIR} ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -c $< |
| 84 |
|
| 85 |
so: |
| 86 |
$(CC) ${SHARED} ../../mod_version.o $(OBJECTS) -o ../$(TARGET).so ${PROFILE} |
| 87 |
diff --git a/src/protocol/Makefile b/src/protocol/Makefile |
| 88 |
index ab837e4..d962d8b 100644 |
| 89 |
--- a/src/protocol/Makefile |
| 90 |
+++ b/src/protocol/Makefile |
| 91 |
@@ -21,7 +21,7 @@ install: |
| 92 |
distclean: clean spotless |
| 93 |
|
| 94 |
.c.o: |
| 95 |
- $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $< |
| 96 |
+ $(CC) -I../${INCLUDEDIR} ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -c $< |
| 97 |
|
| 98 |
.o.s: |
| 99 |
$(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE} |
| 100 |
diff --git a/src/protocol/Makefile.sub b/src/protocol/Makefile.sub |
| 101 |
index a2d6a41..d93e6d5 100644 |
| 102 |
--- a/src/protocol/Makefile.sub |
| 103 |
+++ b/src/protocol/Makefile.sub |
| 104 |
@@ -16,7 +16,7 @@ module: $(OBJECTS) so |
| 105 |
distclean: spotless |
| 106 |
|
| 107 |
.c.o: |
| 108 |
- $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -c $< |
| 109 |
+ $(CC) -I../ -I../../${INCLUDEDIR} ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -c $< |
| 110 |
|
| 111 |
so: |
| 112 |
$(CC) ${SHARED} $(OBJECTS) -o ../$(TARGET).so ${PROFILE} |
| 113 |
diff --git a/src/tools/Makefile b/src/tools/Makefile |
| 114 |
index 4dffbf0..87bd0ae 100644 |
| 115 |
--- a/src/tools/Makefile |
| 116 |
+++ b/src/tools/Makefile |
| 117 |
@@ -10,7 +10,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \ |
| 118 |
'RUNGROUP=${RUNGROUP}' |
| 119 |
|
| 120 |
.c.o: |
| 121 |
- $(CC) $(LDFLAGS) $(CFLAGS) -I../include/ $< -o $* |
| 122 |
+ $(CC) -I../include/ $(LDFLAGS) $(CFLAGS) $< -o $* |
| 123 |
|
| 124 |
all: ${OBJS} |
Archives