summaryrefslogtreecommitdiff
path: root/libc/debian/patches/sgs-libconv-makefile.patch
blob: 226d2181eaf5834ad82116f644e1c479328cd49f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
Description: Fixes for GNU make

Index: b/usr/src/cmd/sgs/libconv/Makefile.targ
===================================================================
--- a/usr/src/cmd/sgs/libconv/Makefile.targ
+++ b/usr/src/cmd/sgs/libconv/Makefile.targ
@@ -24,20 +24,21 @@
 # Use is subject to license terms.
 #
 
-pics/%.o:	../common/%.c
+
+pics/%_machelf32.o:	../common/%_machelf.c
 		$(COMPILE.c) -o $@ $<
 		$(POST_PROCESS_O)
 
-pics/%.o:	%.s
-		$(COMPILE.s) -o $@ $<
+pics/%_machelf64.o:	../common/%_machelf.c
+		$(COMPILE.c) -D_ELF64 -o $@ $<
 		$(POST_PROCESS_O)
 
-pics/%32.o:	../common/%.c
+pics/%.o:	../common/%.c
 		$(COMPILE.c) -o $@ $<
 		$(POST_PROCESS_O)
 
-pics/%64.o:	../common/%.c
-		$(COMPILE.c) -D_ELF64 -o $@ $<
+pics/%.o:	%.s
+		$(COMPILE.s) -o $@ $<
 		$(POST_PROCESS_O)
 
 pics/elfcap.o:	$(ELFCAP)/elfcap.c
@@ -57,10 +58,11 @@ report_bufsize.h:	../Makefile.targ
 		perl ../../tools/libconv_mk_report_bufsize.pl 8000
 
 ../common/%.c ../common/%_machelf.c:	%_msg.h
+	:
 
 %_msg.h %_msg.c: $(SGSMSG) ../common/%.msg report_bufsize.h
 		$(SGSMSG) $(SGSMSGFLAGS) -h $*_msg.h -d $*_msg.c \
-			-n sgs_msg_libconv_$* $<
+			-n sgs_msg_libconv_$* ../common/$*.msg
 
 $(SGSMSG):	FRC
 		@ cd $(SGSTOOLS)/$(MACH); pwd; $(MAKE) catalog