| 1 |
dev-zero 08/04/22 14:51:07 |
| 2 |
|
| 3 |
Added: 2.1.0-various_compile_issues.patch |
| 4 |
Log: |
| 5 |
Version bump (bug #199989). Fixed various compile issues (upstream bug #1948890). |
| 6 |
(Portage version: 2.1.5_rc4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sys-apps/ipmiutil/files/2.1.0-various_compile_issues.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/ipmiutil/files/2.1.0-various_compile_issues.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/ipmiutil/files/2.1.0-various_compile_issues.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: 2.1.0-various_compile_issues.patch |
| 15 |
=================================================================== |
| 16 |
diff -Naur ipmiutil-2.1.0.orig/lib/lanplus/Makefile.am ipmiutil-2.1.0/lib/lanplus/Makefile.am |
| 17 |
--- ipmiutil-2.1.0.orig/lib/lanplus/Makefile.am 2008-04-22 16:24:25.000000000 +0200 |
| 18 |
+++ ipmiutil-2.1.0/lib/lanplus/Makefile.am 2008-04-22 16:38:40.000000000 +0200 |
| 19 |
@@ -1,7 +1,7 @@ |
| 20 |
# Makefile.am for libipmi_lanplus.so and libipmi_lanplus.a |
| 21 |
|
| 22 |
ODIR = obj |
| 23 |
-CFLAGS_STATIC = -DHAVE_CONFIG_H -g -O2 -fno-strict-aliasing -fPIC |
| 24 |
+CFLAGS_STATIC = -DHAVE_CONFIG_H -fno-strict-aliasing -fPIC $(CFLAGS) |
| 25 |
|
| 26 |
MAINTAINERCLEANFILES = Makefile.in |
| 27 |
|
| 28 |
@@ -32,12 +32,12 @@ |
| 29 |
rm -rf $(ODIR) |
| 30 |
|
| 31 |
$(lanplus_liba): $(am_libipmi_lanplus_a_OBJECTS) |
| 32 |
- ar cru $(lanplus_liba) $(am_libipmi_lanplus_a_OBJECTS) |
| 33 |
- ranlib $(lanplus_liba) |
| 34 |
+ $(AR) cru $(lanplus_liba) $(am_libipmi_lanplus_a_OBJECTS) |
| 35 |
+ $(RANLIB) $(lanplus_liba) |
| 36 |
|
| 37 |
$(ODIR): |
| 38 |
mkdir -p $(ODIR) |
| 39 |
|
| 40 |
$(ODIR)/%.o: %.c $(ODIR) |
| 41 |
- gcc -c $(CFLAGS_STATIC) $(INCLUDES) -o $@ $< |
| 42 |
+ $(CC) -c $(CFLAGS_STATIC) $(INCLUDES) -o $@ $< |
| 43 |
|
| 44 |
diff -Naur ipmiutil-2.1.0.orig/util/ipmilanplus.c ipmiutil-2.1.0/util/ipmilanplus.c |
| 45 |
--- ipmiutil-2.1.0.orig/util/ipmilanplus.c 2008-04-22 16:24:25.000000000 +0200 |
| 46 |
+++ ipmiutil-2.1.0/util/ipmilanplus.c 2008-04-22 16:25:15.000000000 +0200 |
| 47 |
@@ -8,6 +8,7 @@ |
| 48 |
*/ |
| 49 |
#include <stdio.h> |
| 50 |
#include <stdarg.h> |
| 51 |
+#include <string.h> |
| 52 |
|
| 53 |
// #define DEBUG 1 |
| 54 |
#ifndef HAVE_LANPLUS |
| 55 |
diff -Naur ipmiutil-2.1.0.orig/util/ipmi_port.c ipmiutil-2.1.0/util/ipmi_port.c |
| 56 |
--- ipmiutil-2.1.0.orig/util/ipmi_port.c 2008-04-22 16:24:25.000000000 +0200 |
| 57 |
+++ ipmiutil-2.1.0/util/ipmi_port.c 2008-04-22 16:26:05.000000000 +0200 |
| 58 |
@@ -12,6 +12,7 @@ |
| 59 |
*/ |
| 60 |
#include <stdio.h> |
| 61 |
#include <stdlib.h> |
| 62 |
+#include <string.h> |
| 63 |
#include <unistd.h> |
| 64 |
#include <fcntl.h> |
| 65 |
#include <netinet/in.h> |
| 66 |
diff -Naur ipmiutil-2.1.0.orig/util/Makefile.am ipmiutil-2.1.0/util/Makefile.am |
| 67 |
--- ipmiutil-2.1.0.orig/util/Makefile.am 2008-04-22 16:24:25.000000000 +0200 |
| 68 |
+++ ipmiutil-2.1.0/util/Makefile.am 2008-04-22 16:35:55.000000000 +0200 |
| 69 |
@@ -54,26 +54,26 @@ |
| 70 |
|
| 71 |
# To build an imb api library (libimbapi.a): |
| 72 |
libimbapi.a: imbapi.c |
| 73 |
- gcc -DHAVE_CONFIG_H -I. -I.. -DLINUX -fPIC -g -O2 -c imbapi.c |
| 74 |
- ar cru libimbapi.a imbapi.o |
| 75 |
- ranlib libimbapi.a |
| 76 |
+ $(CC) -DHAVE_CONFIG_H -I. -I.. -DLINUX -fPIC $(CFLAGS) -c imbapi.c |
| 77 |
+ $(AR) cru libimbapi.a imbapi.o |
| 78 |
+ $(RANLIB) libimbapi.a |
| 79 |
rm -f imbapi.o |
| 80 |
|
| 81 |
# To build a lib to support all of the IPMI drivers (libipmiutil.a) |
| 82 |
libipmiutil.a: $(CMDMOD:.c=.o) @LANPLUS_LIB@ |
| 83 |
- ar cru libipmiutil.a $(CMDMOD:.c=.o) @LANPLUS_LIB@ |
| 84 |
- ranlib libipmiutil.a |
| 85 |
+ $(AR) cru libipmiutil.a $(CMDMOD:.c=.o) @LANPLUS_LIB@ |
| 86 |
+ $(RANLIB) libipmiutil.a |
| 87 |
|
| 88 |
# To build ipmiutil, need to use METACFLAGS for each .c/.o |
| 89 |
|
| 90 |
idiscover: idiscover.c |
| 91 |
- gcc $(CFLAGS) -o idiscover idiscover.c |
| 92 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o idiscover idiscover.c |
| 93 |
|
| 94 |
events: events.c |
| 95 |
- gcc $(CFLAGS) -DTEST -o events events.c |
| 96 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -DTEST -o events events.c |
| 97 |
|
| 98 |
ipmi_port: ipmi_port.c |
| 99 |
- gcc $(CFLAGS) -o ipmi_port ipmi_port.c |
| 100 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o ipmi_port ipmi_port.c |
| 101 |
|
| 102 |
ipmiutil_SOURCES = $(METASOURCE) |
| 103 |
|
| 104 |
diff -Naur ipmiutil-2.1.0.orig/util/Makefile.am-all ipmiutil-2.1.0/util/Makefile.am-all |
| 105 |
--- ipmiutil-2.1.0.orig/util/Makefile.am-all 2008-04-22 16:24:25.000000000 +0200 |
| 106 |
+++ ipmiutil-2.1.0/util/Makefile.am-all 2008-04-22 16:39:04.000000000 +0200 |
| 107 |
@@ -42,7 +42,7 @@ |
| 108 |
AM_CPPFLAGS += @LANPLUS_CFLAGS@ |
| 109 |
LDADD += @LANPLUS_LDADD@ |
| 110 |
|
| 111 |
-METACFLAGS = -I. -I.. -DMETACOMMAND $(AM_CPPFLAGS) |
| 112 |
+METACFLAGS = -I. -I.. -DMETACOMMAND $(AM_CPPFLAGS) $(CFLAGS) |
| 113 |
METASOURCE = ipmiutil.c alarms.c bmchealth.c events.c fruconfig.c getevent.c hwreset.c icmd.c pefconfig.c sensor.c showsel.c tmconfig.c wdt.c isolconsole.c idiscover.c $(CMDMOD) |
| 114 |
METALD = @LANDESK_LDADD@ @LANPLUS_LIB@ @LANPLUS_CRYPTO@ -lpthread |
| 115 |
LDADD += -lpthread |
| 116 |
@@ -52,35 +52,35 @@ |
| 117 |
|
| 118 |
# To build an imb api library (libimbapi.a): |
| 119 |
libimbapi.a: imbapi.c |
| 120 |
- gcc -DHAVE_CONFIG_H -I. -I.. -DLINUX -fPIC -g -O2 -c imbapi.c |
| 121 |
- ar cru libimbapi.a imbapi.o |
| 122 |
- ranlib libimbapi.a |
| 123 |
+ $(CC) -DHAVE_CONFIG_H -I. -I.. -DLINUX -fPIC $(CFLAGS) -c imbapi.c |
| 124 |
+ $(AR) cru libimbapi.a imbapi.o |
| 125 |
+ $(RANLIB) libimbapi.a |
| 126 |
rm -f imbapi.o |
| 127 |
|
| 128 |
# To build a lib to support all of the IPMI drivers (libipmiutil.a) |
| 129 |
libipmiutil.a: $(CMDMOD:.c=.o) @LANPLUS_LIB@ |
| 130 |
- ar cru libipmiutil.a $(CMDMOD:.c=.o) @LANPLUS_LIB@ |
| 131 |
- ranlib libipmiutil.a |
| 132 |
+ $(AR) cru libipmiutil.a $(CMDMOD:.c=.o) @LANPLUS_LIB@ |
| 133 |
+ $(RANLIB) libipmiutil.a |
| 134 |
|
| 135 |
# To build ipmiutil, need to use METACFLAGS for each .c/.o |
| 136 |
ipmiutil: $(METASOURCE) |
| 137 |
@for f in $(METASOURCE); do \ |
| 138 |
- echo "gcc $(METACFLAGS) -c $$f"; \ |
| 139 |
- gcc $(METACFLAGS) -c $$f; done |
| 140 |
+ echo "$(CC) $(METACFLAGS) -c $$f"; \ |
| 141 |
+ $(CC) $(METACFLAGS) -c $$f; done |
| 142 |
@METAOBJ=`echo $(METASOURCE) | sed -e 's/ipmilan2.c//' | \ |
| 143 |
sed -e 's/.c$$/.o/g' -e 's/.c /.o /g'`; \ |
| 144 |
- echo "gcc -g -O2 -o ipmiutil $$METAOBJ $(METALD)"; \ |
| 145 |
- gcc -g -O2 -o ipmiutil $$METAOBJ $(METALD); \ |
| 146 |
+ echo "$(CC) -o ipmiutil $$METAOBJ $(METALD)"; \ |
| 147 |
+ $(CC) -o ipmiutil $$METAOBJ $(METALD); \ |
| 148 |
rm -f $$METAOBJ |
| 149 |
|
| 150 |
idiscover: idiscover.c |
| 151 |
- gcc $(CFLAGS) -o idiscover idiscover.c |
| 152 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o idiscover idiscover.c |
| 153 |
|
| 154 |
events: events.c |
| 155 |
- gcc $(CFLAGS) -DTEST -o events events.c |
| 156 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -DTEST -o events events.c |
| 157 |
|
| 158 |
ipmi_port: ipmi_port.c |
| 159 |
- gcc $(CFLAGS) -o ipmi_port ipmi_port.c |
| 160 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o ipmi_port ipmi_port.c |
| 161 |
|
| 162 |
ipmiutil_SOURCES = |
| 163 |
|
| 164 |
|
| 165 |
|
| 166 |
|
| 167 |
-- |
| 168 |
gentoo-commits@l.g.o mailing list |
Archives