| 1 |
xarthisius 10/05/29 13:10:45 |
| 2 |
|
| 3 |
Added: amiwm-0.20_p48-gentoo.diff |
| 4 |
Log: |
| 5 |
Fix parallel build wrt bug 248680, don't strip files wrt bug 299918 + other QA fixes |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 x11-wm/amiwm/files/amiwm-0.20_p48-gentoo.diff |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/amiwm/files/amiwm-0.20_p48-gentoo.diff?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/amiwm/files/amiwm-0.20_p48-gentoo.diff?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: amiwm-0.20_p48-gentoo.diff |
| 15 |
=================================================================== |
| 16 |
Fix parallel build, don't strip binaries, respect CC LDFLAGS, fix install dirs |
| 17 |
Fix incompatible implicit declaration of built-in function {strlen,memset,strcpy} |
| 18 |
|
| 19 |
http://bugs.gentoo.org/show_bug.cgi?id=248680 |
| 20 |
http://bugs.gentoo.org/show_bug.cgi?id=299918 |
| 21 |
|
| 22 |
--- Makefile.in |
| 23 |
+++ Makefile.in |
| 24 |
@@ -1,7 +1,6 @@ |
| 25 |
srcdir = @srcdir@ |
| 26 |
VPATH = @srcdir@ |
| 27 |
SHELL = /bin/sh |
| 28 |
-CC = @CC@ |
| 29 |
LEX = @LEX@ |
| 30 |
YACC = @YACC@ |
| 31 |
CFLAGS = @CFLAGS@ |
| 32 |
@@ -14,7 +13,7 @@ |
| 33 |
exec_prefix = @exec_prefix@ |
| 34 |
bindir = $(exec_prefix)/bin |
| 35 |
libdir = $(exec_prefix)/lib |
| 36 |
-mandir = $(prefix)/man |
| 37 |
+mandir = $(prefix)/share/man |
| 38 |
INSTALL = @INSTALL@ |
| 39 |
LN_S = @LN_S@ |
| 40 |
RM = -rm -f |
| 41 |
@@ -44,8 +43,14 @@ |
| 42 |
|
| 43 |
AMIWM_HOME = $(libdir)/amiwm |
| 44 |
|
| 45 |
+.PHONY: yaccs all clean lib lexs |
| 46 |
+ |
| 47 |
+.SUFFIXES: .c |
| 48 |
+ |
| 49 |
all : $(PROGS) $(MODULES) |
| 50 |
|
| 51 |
+$(OBJS): lexs |
| 52 |
+ |
| 53 |
lib : |
| 54 |
@( cd libami; $(MAKE) libami.a ) |
| 55 |
|
| 56 |
@@ -64,71 +69,63 @@ |
| 57 |
ppmtoinfo.o : ppmtoinfo.c |
| 58 |
$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) -DAMIWM_HOME=\"$(AMIWM_HOME)\" $< |
| 59 |
|
| 60 |
-gram.h gram.c: gram.y |
| 61 |
- $(YACC) $(YFLAGS) gram.y |
| 62 |
- mv y.tab.c gram.c |
| 63 |
- mv y.tab.h gram.h |
| 64 |
+yaccs: gram.c kbdmodule.c |
| 65 |
+lexs: yaccs lex.c kbdlexer.c |
| 66 |
+ |
| 67 |
+%.c: %.y |
| 68 |
+ $(YACC) $(YFLAGS) $< -o $@ |
| 69 |
|
| 70 |
lex.c : lex.l |
| 71 |
$(LEX) -t lex.l > lex.c |
| 72 |
|
| 73 |
-kbdmodule.h kbdmodule.c: kbdmodule.y |
| 74 |
- $(YACC) $(YFLAGS) kbdmodule.y |
| 75 |
- mv y.tab.c kbdmodule.c |
| 76 |
- mv y.tab.h kbdmodule.h |
| 77 |
- |
| 78 |
kbdlexer.c : kbdlexer.l |
| 79 |
$(LEX) -t kbdlexer.l > kbdlexer.c |
| 80 |
|
| 81 |
-install : $(PROGS) $(MODULES) Xsession Xsession2 Xinitrc amiwm-init |
| 82 |
- -mkdir -p $(AMIWM_HOME) |
| 83 |
- $(INSTALL) -s requestchoice $(AMIWM_HOME)/requestchoice |
| 84 |
- $(INSTALL) -s executecmd $(AMIWM_HOME)/executecmd |
| 85 |
+install : Xsession Xsession2 Xinitrc amiwm-init |
| 86 |
+ $(INSTALL) -D requestchoice $(DESTDIR)$(AMIWM_HOME)/requestchoice |
| 87 |
+ $(INSTALL) executecmd $(DESTDIR)$(AMIWM_HOME)/executecmd |
| 88 |
for module in $(MODULES); do \ |
| 89 |
if [ "$$module" = "Background" ]; then \ |
| 90 |
- $(INSTALL) $$module $(AMIWM_HOME)/$$module; \ |
| 91 |
+ $(INSTALL) $$module $(DESTDIR)$(AMIWM_HOME)/$$module; \ |
| 92 |
else \ |
| 93 |
- $(INSTALL) -s $$module $(AMIWM_HOME)/$$module; \ |
| 94 |
+ $(INSTALL) $$module $(DESTDIR)$(AMIWM_HOME)/$$module; \ |
| 95 |
fi \ |
| 96 |
done |
| 97 |
- $(INSTALL) -m 644 system.amiwmrc $(AMIWM_HOME)/system.amiwmrc |
| 98 |
- $(INSTALL) -m 644 def_tool.info $(AMIWM_HOME)/def_tool.info |
| 99 |
- $(INSTALL) -m 644 system.map $(AMIWM_HOME)/system.map |
| 100 |
- $(INSTALL) -m 644 magicwb.map $(AMIWM_HOME)/magicwb.map |
| 101 |
- $(INSTALL) -m 644 schwartz.map $(AMIWM_HOME)/schwartz.map |
| 102 |
- $(INSTALL) -m 755 Xsession $(AMIWM_HOME)/Xsession |
| 103 |
- $(INSTALL) -m 755 Xsession2 $(AMIWM_HOME)/Xsession2 |
| 104 |
- $(INSTALL) -m 755 Xinitrc $(AMIWM_HOME)/Xinitrc |
| 105 |
- $(INSTALL) -m 755 amiwm-init $(AMIWM_HOME)/amiwm-init |
| 106 |
- $(INSTALL) -s amiwm $(bindir)/amiwm |
| 107 |
- $(INSTALL) -s ppmtoinfo $(bindir)/ppmtoinfo |
| 108 |
- $(RM) $(bindir)/requestchoice |
| 109 |
- $(LN_S) $(AMIWM_HOME)/requestchoice $(bindir)/requestchoice |
| 110 |
- -mkdir -p $(mandir)/man1 |
| 111 |
- $(INSTALL) -m 644 amiwm.1 $(mandir)/man1/amiwm.1 |
| 112 |
+ $(INSTALL) -m 644 system.amiwmrc $(DESTDIR)$(AMIWM_HOME)/system.amiwmrc |
| 113 |
+ $(INSTALL) -m 644 def_tool.info $(DESTDIR)$(AMIWM_HOME)/def_tool.info |
| 114 |
+ $(INSTALL) -m 644 system.map $(DESTDIR)$(AMIWM_HOME)/system.map |
| 115 |
+ $(INSTALL) -m 644 magicwb.map $(DESTDIR)$(AMIWM_HOME)/magicwb.map |
| 116 |
+ $(INSTALL) -m 644 schwartz.map $(DESTDIR)$(AMIWM_HOME)/schwartz.map |
| 117 |
+ $(INSTALL) -m 755 Xsession $(DESTDIR)$(AMIWM_HOME)/Xsession |
| 118 |
+ $(INSTALL) -m 755 Xsession2 $(DESTDIR)$(AMIWM_HOME)/Xsession2 |
| 119 |
+ $(INSTALL) -m 755 Xinitrc $(DESTDIR)$(AMIWM_HOME)/Xinitrc |
| 120 |
+ $(INSTALL) -m 755 amiwm-init $(DESTDIR)$(AMIWM_HOME)/amiwm-init |
| 121 |
+ $(INSTALL) -D amiwm $(DESTDIR)$(bindir)/amiwm |
| 122 |
+ $(INSTALL) ppmtoinfo $(DESTDIR)$(bindir)/ppmtoinfo |
| 123 |
+ $(RM) $(DESTDIR)$(bindir)/requestchoice |
| 124 |
+ $(LN_S) $(DESTDIR)$(AMIWM_HOME)/requestchoice $(DESTDIR)$(bindir)/requestchoice |
| 125 |
+ $(INSTALL) -D -m 644 amiwm.1 $(DESTDIR)$(mandir)/man1/amiwm.1 |
| 126 |
|
| 127 |
cde-install : Xresources.amiwm Amilogo.bm Amilogo.pm |
| 128 |
- -mkdir -p $(DT_DIR)/config/C/Xresources.d |
| 129 |
- $(INSTALL) -m 644 Xresources.amiwm $(DT_DIR)/config/C/Xresources.d/Xresources.amiwm |
| 130 |
- -mkdir -p $(DT_DIR)/appconfig/icons/C |
| 131 |
- $(INSTALL) -m 644 Amilogo.bm $(DT_DIR)/appconfig/icons/C/Amilogo.bm |
| 132 |
- $(INSTALL) -m 644 Amilogo.pm $(DT_DIR)/appconfig/icons/C/Amilogo.pm |
| 133 |
+ $(INSTALL) -D -m 644 Xresources.amiwm $(DESTDIR)$(DT_DIR)/config/C/Xresources.d/Xresources.amiwm |
| 134 |
+ $(INSTALL) -D -m 644 Amilogo.bm $(DESTDIR)$(DT_DIR)/appconfig/icons/C/Amilogo.bm |
| 135 |
+ $(INSTALL) -m 644 Amilogo.pm $(DESTDIR)$(DT_DIR)/appconfig/icons/C/Amilogo.pm |
| 136 |
|
| 137 |
|
| 138 |
amiwm : $(OBJS) lib |
| 139 |
- $(CC) -o amiwm $(OBJS) $(LIBS) |
| 140 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o amiwm $(OBJS) $(LIBS) |
| 141 |
|
| 142 |
requestchoice : requestchoice.o lib |
| 143 |
- $(CC) -o requestchoice requestchoice.o $(LIBS) |
| 144 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o requestchoice requestchoice.o $(LIBS) |
| 145 |
|
| 146 |
executecmd : executecmd.o lib |
| 147 |
- $(CC) -o executecmd executecmd.o $(LIBS) |
| 148 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o executecmd executecmd.o $(LIBS) |
| 149 |
|
| 150 |
Keyboard : kbdmodule.o kbdlexer.o lib |
| 151 |
- $(CC) -o Keyboard kbdmodule.o kbdlexer.o $(LIBS) |
| 152 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o Keyboard kbdmodule.o kbdlexer.o $(LIBS) |
| 153 |
|
| 154 |
ppmtoinfo : ppmtoinfo.o |
| 155 |
- $(CC) -o ppmtoinfo ppmtoinfo.o -lm |
| 156 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o ppmtoinfo ppmtoinfo.o -lm |
| 157 |
|
| 158 |
clean : |
| 159 |
$(RM) core $(PROGS) $(LIBAMI) *.o libami/*.o |
| 160 |
--- icc.c |
| 161 |
+++ icc.c |
| 162 |
@@ -1,3 +1,4 @@ |
| 163 |
+#include <string.h> |
| 164 |
#include "drawinfo.h" |
| 165 |
#include "screen.h" |
| 166 |
#include "icc.h" |
| 167 |
--- rc.c |
| 168 |
+++ rc.c |
| 169 |
@@ -1,7 +1,7 @@ |
| 170 |
#include <stdio.h> |
| 171 |
#include <stdlib.h> |
| 172 |
#include <X11/Xmu/CharSet.h> |
| 173 |
- |
| 174 |
+#include <string.h> |
| 175 |
#include "alloc.h" |
| 176 |
#include "prefs.h" |
| 177 |
#include "drawinfo.h" |
| 178 |
--- libami/drawinfo.c |
| 179 |
+++ libami/drawinfo.c |
| 180 |
@@ -1,7 +1,7 @@ |
| 181 |
#include <X11/Xlib.h> |
| 182 |
#include <stdio.h> |
| 183 |
#include <stdlib.h> |
| 184 |
- |
| 185 |
+#include <string.h> |
| 186 |
#include "alloc.h" |
| 187 |
#include "drawinfo.h" |
| 188 |
|
| 189 |
--- libami/mdscreen.c |
| 190 |
+++ libami/mdscreen.c |
| 191 |
@@ -1,3 +1,4 @@ |
| 192 |
+#include <string.h> |
| 193 |
#include "libami.h" |
| 194 |
#include "module.h" |
| 195 |
|
| 196 |
--- libami/error.c |
| 197 |
+++ libami/error.c |
| 198 |
@@ -1,4 +1,5 @@ |
| 199 |
#include <stdio.h> |
| 200 |
+#include <string.h> |
| 201 |
#include "libami.h" |
| 202 |
|
| 203 |
#ifndef AMIGAOS |
Archives