diff options
Diffstat (limited to 'meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch')
-rw-r--r-- | meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch b/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch index e6544b5607..5379eb6aa2 100644 --- a/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch +++ b/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch | |||
@@ -10,13 +10,13 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | |||
10 | ppdc/Makefile | 30 +++++++++++++++--------------- | 10 | ppdc/Makefile | 30 +++++++++++++++--------------- |
11 | 1 files changed, 15 insertions(+), 15 deletions(-) | 11 | 1 files changed, 15 insertions(+), 15 deletions(-) |
12 | 12 | ||
13 | diff --git a/ppdc/Makefile b/ppdc/Makefile | 13 | Index: cups-2.0.0/ppdc/Makefile |
14 | index 0288d47..fc87f1b 100644 | 14 | =================================================================== |
15 | --- a/ppdc/Makefile | 15 | --- cups-2.0.0.orig/ppdc/Makefile |
16 | +++ b/ppdc/Makefile | 16 | +++ cups-2.0.0/ppdc/Makefile |
17 | @@ -243,8 +243,8 @@ genstrings: genstrings.o libcupsppdc.a ../cups/libcups.a \ | 17 | @@ -242,8 +242,8 @@ genstrings: genstrings.o libcupsppdc.a |
18 | $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \ | 18 | $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \ |
19 | libcupsppdc.a ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) \ | 19 | libcupsppdc.a ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \ |
20 | $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) | 20 | $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) |
21 | - echo Generating localization strings... | 21 | - echo Generating localization strings... |
22 | - ./genstrings >sample.c | 22 | - ./genstrings >sample.c |
@@ -25,9 +25,9 @@ index 0288d47..fc87f1b 100644 | |||
25 | 25 | ||
26 | 26 | ||
27 | # | 27 | # |
28 | @@ -261,9 +261,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cups/libcups.a foo.drv foo-fr.po | 28 | @@ -260,9 +260,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cu |
29 | $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \ | 29 | $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \ |
30 | ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ | 30 | ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ |
31 | $(COMMONLIBS) $(LIBZ) | 31 | $(COMMONLIBS) $(LIBZ) |
32 | - echo Testing PPD compiler... | 32 | - echo Testing PPD compiler... |
33 | - ./ppdc-static -l en,fr -I ../data foo.drv | 33 | - ./ppdc-static -l en,fr -I ../data foo.drv |
@@ -38,24 +38,26 @@ index 0288d47..fc87f1b 100644 | |||
38 | 38 | ||
39 | 39 | ||
40 | # | 40 | # |
41 | @@ -290,16 +290,16 @@ ppdi-static: ppdc-static ppdi.o libcupsppdc.a ../cups/libcups.a | 41 | @@ -288,17 +288,17 @@ ppdi-static: ppdc-static ppdi.o libcups |
42 | ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ | 42 | $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \ |
43 | ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ | ||
43 | $(COMMONLIBS) $(LIBZ) | 44 | $(COMMONLIBS) $(LIBZ) |
44 | echo Testing PPD importer... | 45 | - echo Testing PPD importer... |
45 | - $(RM) -r ppd ppd2 sample-import.drv | 46 | - $(RM) -r ppd ppd2 sample-import.drv |
46 | - ./ppdc-static -I ../data sample.drv | 47 | - ./ppdc-static -l en -I ../data sample.drv |
47 | - ./ppdi-static -I ../data -o sample-import.drv ppd/* | 48 | - ./ppdi-static -I ../data -o sample-import.drv ppd/* |
48 | - ./ppdc-static -I ../data -d ppd2 sample-import.drv | 49 | - ./ppdc-static -l en -I ../data -d ppd2 sample-import.drv |
49 | - if diff -r ppd ppd2 >/dev/null; then \ | 50 | - if diff -r ppd ppd2 >/dev/null; then \ |
50 | - echo PPD import OK; \ | 51 | - echo PPD import OK; \ |
51 | - else \ | 52 | - else \ |
52 | - echo PPD import FAILED; \ | 53 | - echo PPD import FAILED; \ |
53 | - exit 1; \ | 54 | - exit 1; \ |
54 | - fi | 55 | - fi |
56 | +# echo Testing PPD importer... | ||
55 | +# $(RM) -r ppd ppd2 sample-import.drv | 57 | +# $(RM) -r ppd ppd2 sample-import.drv |
56 | +# ./ppdc-static -I ../data sample.drv | 58 | +# ./ppdc-static -l en -I ../data sample.drv |
57 | +# ./ppdi-static -I ../data -o sample-import.drv ppd/* | 59 | +# ./ppdi-static -I ../data -o sample-import.drv ppd/* |
58 | +# ./ppdc-static -I ../data -d ppd2 sample-import.drv | 60 | +# ./ppdc-static -l en -I ../data -d ppd2 sample-import.drv |
59 | +# if diff -r ppd ppd2 >/dev/null; then \ | 61 | +# if diff -r ppd ppd2 >/dev/null; then \ |
60 | +# echo PPD import OK; \ | 62 | +# echo PPD import OK; \ |
61 | +# else \ | 63 | +# else \ |
@@ -65,6 +67,3 @@ index 0288d47..fc87f1b 100644 | |||
65 | 67 | ||
66 | 68 | ||
67 | # | 69 | # |
68 | -- | ||
69 | 1.6.6.1 | ||
70 | |||