diff options
| author | Olivier Schonken <olivier.schonken@gmail.com> | 2016-01-21 00:17:43 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-01-21 23:37:01 +0100 |
| commit | d37ce8e1a4edc9a06831e6b0842996866534b1ea (patch) | |
| tree | e2001fb3b165b2a995840c644cc145f78909680a /package/cups/0002-Do-not-use-genstrings.patch | |
| parent | 837de1793a37d350e689c03eeaa32f6477bcfd43 (diff) | |
| download | buildroot-d37ce8e1a4edc9a06831e6b0842996866534b1ea.tar.gz buildroot-d37ce8e1a4edc9a06831e6b0842996866534b1ea.zip | |
package/cups: Un-deprecate, and update CUPS to 2.1.2
- Remove 0001-fix-static.patch - Fixed upstream
- Remove 0002-fix-stack-protector-check.patch - Fixed upstream
- Remove 0003-mantohtml.patch - Replaced by
0001-Remove-man-from-BUILDDIRS-in- configure.patch
- Add 0002-Do-not-use-genstrings.patch
- Add CUPS_PDFTOPS option to Config.in.legacy - This support was
moved to the cups-filters package.
Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
[Thomas:
- rewrap patch description in patch 0001
- adjust patch 0002 to completely remove the call to genstrings
instead of commenting it, and remove the potentially confusing
'echo' above it
- add a third patch that sanitizes the installation process to avoid
non-working stripping, owernship changes, etc.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/cups/0002-Do-not-use-genstrings.patch')
| -rw-r--r-- | package/cups/0002-Do-not-use-genstrings.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/package/cups/0002-Do-not-use-genstrings.patch b/package/cups/0002-Do-not-use-genstrings.patch new file mode 100644 index 0000000000..325483ea8f --- /dev/null +++ b/package/cups/0002-Do-not-use-genstrings.patch @@ -0,0 +1,36 @@ +From 193c8d8c55a3478ca5c9e161ce581e5794098c6d Mon Sep 17 00:00:00 2001 +From: Olivier Schonken <olivier.schonken@gmail.com> +Date: Thu, 21 Jan 2016 23:04:49 +0100 +Subject: [PATCH] Do not use genstrings + +Using cross compiled genstrings while cross-compiling will break +compilation. Genstrings is still compiled because some power users +might want to do ppd compilation on their target machine, and for that +they would need to use the native compiled genstrings binary, to +generate a sample.c file for their target + +Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com> +[Thomas: completely remove call to genstrings rather than commenting +it, remove useless and potentially confusing 'echo' before the +genstrings call.] +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +--- + ppdc/Makefile | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/ppdc/Makefile b/ppdc/Makefile +index 68bf6b2..d57a0c9 100644 +--- a/ppdc/Makefile ++++ b/ppdc/Makefile +@@ -242,8 +242,6 @@ genstrings: genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \ + $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \ + libcupsppdc.a ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \ + $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) +- echo Generating localization strings... +- ./genstrings >sample.c + + + # +-- +2.6.4 + |
