[Buildroot] [PATCH v3 1/5] package/cups: Un-deprecate, and update CUPS to 2.1.0
Samuel Martin
s.martin49 at gmail.com
Tue Jan 19 21:46:23 UTC 2016
Hi Olivier,
Thanks for this series, and apologies for not coming back sooner to you :-s
On Thu, Sep 17, 2015 at 2:23 PM, Olivier Schonken
<olivier.schonken at gmail.com> wrote:
> Remove 0001-fix-static.patch - Fixed upstream
> Remove 0002-fix-stack-protector-check.patch - Fixed upstream
> Remove 0003-mantohtml.patch - Replaced by 0001-Remove-building-html-from-man-
> makefile.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 at gmail.com>
> ---
> Config.in.legacy | 7 +++
> ...01-Remove-building-html-from-man-makefile.patch | 27 +++++++++++
> package/cups/0001-fix-static.patch | 28 -----------
> package/cups/0002-Do-not-use-genstrings.patch | 30 ++++++++++++
> package/cups/0002-fix-stack-protector-check.patch | 25 ----------
> package/cups/0003-mantohtml.patch | 11 -----
> package/cups/Config.in | 17 +------
> package/cups/cups.hash | 4 ++
> package/cups/cups.mk | 55 +++++++++++++++-------
> 9 files changed, 107 insertions(+), 97 deletions(-)
> create mode 100644 package/cups/0001-Remove-building-html-from-man-makefile.patch
> delete mode 100644 package/cups/0001-fix-static.patch
> create mode 100644 package/cups/0002-Do-not-use-genstrings.patch
> delete mode 100644 package/cups/0002-fix-stack-protector-check.patch
> delete mode 100644 package/cups/0003-mantohtml.patch
> create mode 100644 package/cups/cups.hash
>
> diff --git a/Config.in.legacy b/Config.in.legacy
> index 18231fd..fafae00 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -107,6 +107,13 @@ endif
> ###############################################################################
> comment "Legacy options removed in 2015.11"
This obviously will need to be updated ;-)
>
> +config BR2_PACKAGE_CUPS_PDFTOPS
> + bool "Pdftops support has been removed from Cups"
> + select BR2_LEGACY
> + help
> + Pdftops support has been removed from the cups package
> + It is now part of the cups-filters package.
> +
> config BR2_PACKAGE_BLACKBOX
> bool "blackbox package has been removed"
> select BR2_LEGACY
> diff --git a/package/cups/0001-Remove-building-html-from-man-makefile.patch b/package/cups/0001-Remove-building-html-from-man-makefile.patch
> new file mode 100644
> index 0000000..5468c92
> --- /dev/null
> +++ b/package/cups/0001-Remove-building-html-from-man-makefile.patch
> @@ -0,0 +1,27 @@
> +From da960a1384625d2550ffbf5765a10fe9b3aa5a51 Mon Sep 17 00:00:00 2001
> +From: Olivier Schonken <olivier.schonken at gmail.com>
> +Date: Wed, 18 Mar 2015 20:30:39 +0200
> +Subject: [PATCH] Remove building html from man makefile
> +
> +Building and using mantohtml causes problems for cross-compiling
> +
> +Signed-off-by: Olivier Schonken <olivier.schonken at gmail.com>
> +---
> + man/Makefile | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/man/Makefile b/man/Makefile
> +index dc1a8c0..0ad42a1 100644
> +--- a/man/Makefile
> ++++ b/man/Makefile
> +@@ -73,7 +73,7 @@ MAN8 = cupsaccept.$(MAN8EXT) \
> + # Make everything...
> + #
> +
> +-all: $(MAN1) $(MAN5) $(MAN7) $(MAN8) html
> ++all: $(MAN1) $(MAN5) $(MAN7) $(MAN8)
As Ryan already said, we don't really care about manpages on the target
Instead of this patch only disabling some part of the man, how about
disabling the whole man build (i.e. [1])?
[> @@ -1,11 +0,0 @@
> ---- cups-1.3.5/man/Makefile 2007-07-12 21:01:14.000000000 -0400
> -+++ cups-1.3.5/man/Makefile 2008-02-11 08:55:24.000000000 -0500
> -@@ -173,7 +173,7 @@ html: $(MAN1) $(MAN5) $(MAN7) $(MAN8) ma
> - done
> -
> - mantohtml: mantohtml.o
> -- $(CC) $(LDFLAGS) -o $@ mantohtml.o
> -+ gcc -I/usr/include -I../ -L/usr/lib mantohtml.c -o mantohtml
> -
> -
> - #
> diff --git a/package/cups/Config.in b/package/cups/Config.in
> index 8e60221..0ef0761 100644
> --- a/package/cups/Config.in
> +++ b/package/cups/Config.in
> @@ -1,23 +1,10 @@
> config BR2_PACKAGE_CUPS
> bool "cups"
> - # serious security issues, needs upgrading
> - depends on BR2_DEPRECATED_SINCE_2015_05
> + # needs libstdcpp for ppdc
> + depends on BR2_INSTALL_LIBSTDCPP
Here you are adding a toolchain dependency, please add a comment when
this dependency is not met [2].
> # needs fork()
> depends on BR2_USE_MMU
> help
> The Common Unix Printing System
>
> http://www.cups.org
> -
> -if BR2_PACKAGE_CUPS
> -
> -config BR2_PACKAGE_CUPS_PDFTOPS
> - bool "pdftops support"
> - depends on BR2_INSTALL_LIBSTDCPP
> - help
> - Enable pdftops support
> -
> -comment "pdftops support needs a toolchain w/ C++"
> - depends on !BR2_INSTALL_LIBSTDCPP
> -
> -endif
> diff --git a/package/cups/cups.hash b/package/cups/cups.hash
> new file mode 100644
> index 0000000..76af0be
> --- /dev/null
> +++ b/package/cups/cups.hash
> @@ -0,0 +1,4 @@
> +# From https://www.cups.org/
> +md5 c4e57a66298bfdba66bb3d5bedd317a4 cups-2.1.0-source.tar.bz2
> +# Locally calculated
> +sha256 ba0238418442b8d84e09a865d0df6a728a20399826c5b466b14b1e9ab8c6d2c9 cups-2.1.0-source.tar.bz2
> diff --git a/package/cups/cups.mk b/package/cups/cups.mk
> index c028ef4..3921b4f 100644
> --- a/package/cups/cups.mk
> +++ b/package/cups/cups.mk
> @@ -4,7 +4,7 @@
> #
> ################################################################################
>
> -CUPS_VERSION = 1.3.11
> +CUPS_VERSION = 2.1.0
> CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.bz2
> CUPS_SITE = http://www.cups.org/software/$(CUPS_VERSION)
> CUPS_LICENSE = GPLv2 LGPLv2
> @@ -12,20 +12,29 @@ CUPS_LICENSE_FILES = LICENSE.txt
> CUPS_INSTALL_STAGING = YES
> CUPS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) DSTROOT=$(STAGING_DIR) install
> CUPS_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) DSTROOT=$(TARGET_DIR) install
> +
> +# Don't use -fPIE and -pie for static builds
> +ifeq ($(BR2_STATIC_LIBS),y)
> +define CUPS_REMOVE_PIEFLAGS
> + $(SED) s/@PIEFLAGS@// $(@D)/Makedefs.in
> +endef
> +CUPS_PRE_CONFIGURE_HOOKS += CUPS_REMOVE_PIEFLAGS
> +endif
I doubt this is needed.
I give a try with this defconfig [3], without this hook, it builds fine.
> +
> CUPS_CONF_OPTS = \
> --without-perl \
> --without-java \
> --without-php \
> - --disable-gnutls \
> --disable-gssapi \
> --libdir=/usr/lib
> CUPS_CONFIG_SCRIPTS = cups-config
> -
> CUPS_DEPENDENCIES = \
> - $(if $(BR2_PACKAGE_ZLIB),zlib) \
> - $(if $(BR2_PACKAGE_LIBPNG),libpng) \
> - $(if $(BR2_PACKAGE_JPEG),jpeg) \
> - $(if $(BR2_PACKAGE_TIFF),tiff)
> + $(if $(BR2_PACKAGE_ZLIB),zlib)
> +
> +ifeq ($(BR2_PACKAGE_SYSTEMD),y)
> +CUPS_CONF_OPTS += --with-systemdunitdir=/usr/lib/systemd/system
Please, here add the --enable-systemd, and the corresponding
else-block, otherwise the defconfig [3] does not build.
> +CUPS_DEPENDENCIES += systemd
> +endif
>
[...]
[1] http://code.bulix.org/3t2b52-90353
[2] http://nightly.buildroot.org/manual.html#dependencies-target-toolchain-options
[3] http://code.bulix.org/2lwfad-90448
Regards,
--
Samuel
More information about the buildroot
mailing list