package/cups-filters: drop useless hook and fix build
cover package/cups-filters: drop useless hook and fix build
From: Carlos Santos <[email protected]>
Patch 1 drops the pre-configure hook that became unnecessary after the upgrade to version 1.25.6.
Patch 2 fixes the build on old Linux distributions, which got broken because the ln-srf script that was not included in the 1.25.6 release tarball.
Carlos Santos (2):
package/cups-filters: drop pre-configure hook package/cups-filters: fix ln -r workaround for older distributions
...ild-system-add-missing-ln-srf-script.patch | 71 +++++++++++++++++++ package/cups-filters/cups-filters.mk | 11 +-- 2 files changed, 77 insertions(+), 5 deletions(-) create mode 100644 package/cups-filters/0001-Build-system-add-missing-ln-srf-script.patch
Signature · 1 line
2.18.1
PATCH 1/2 package/cups-filters: drop pre-configure hook
From: Carlos Santos <[email protected]>
Version 1.25.6 contains the config.rpath and ABOUT-NLS, so it wouldn't be necessary to fake them even if we still used autoreconf.
---
CC: Peter Korsgaard <[email protected]>
--- package/cups-filters/cups-filters.mk | 8 -------- 1 file changed, 8 deletions(-)
package/cups-filters/cups-filters.mk +0 -8
@@ -20,14 +20,6 @@ CUPS_FILTERS_CONF_OPTS = --disable-imagefilters \ --with-pdftops=pdftops \ --with-jpeg -# After 0002-filter-texttotext.c-link-with-libiconv-if-needed.patch autoreconf -# needs config.rpath and ABOUT-NLS, which are not in v1.25.4 yet. Fake them. -define CUPS_FILTERS_ADD_MISSING_FILE - touch $(@D)/config.rpath $(@D)/ABOUT-NLS -endef - -CUPS_FILTERS_PRE_CONFIGURE_HOOKS = CUPS_FILTERS_ADD_MISSING_FILE - ifeq ($(BR2_PACKAGE_LIBPNG),y) CUPS_FILTERS_CONF_OPTS += --with-png CUPS_FILTERS_DEPENDENCIES += libpng
Signature · 1 line
2.18.1
PATCH 1/2 package/cups-filters: drop pre-configure hook
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"unixmania" == unixmania <[email protected]> writes:
From: Carlos Santos <[email protected]>
Version 1.25.6 contains the config.rpath and ABOUT-NLS, so it wouldn't be necessary to fake them even if we still used autoreconf.Signed-off-by Carlos Santos <[email protected]>---
CC: Peter Korsgaard <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 2/2 package/cups-filters: fix ln -r workaround for older distributions
In reply to unixmania at gmail.comFrom: Carlos Santos <[email protected]>
Add a patch to create the ln-srf script that was not included in the 1.25.6 release tarball. Also add a post-patch hook to ensure that the script executable, since but GNU patch < 2.7 does not handle the git patch permission extensions.
Fixes:
http://autobuild.buildroot.net/results/c78e7d6d703b1b48ba19d8c4fae32b4e4489cb43/
---
CC: Peter Korsgaard <[email protected]>
--- ...ild-system-add-missing-ln-srf-script.patch | 71 +++++++++++++++++++ package/cups-filters/cups-filters.mk | 9 +++ 2 files changed, 80 insertions(+) create mode 100644 package/cups-filters/0001-Build-system-add-missing-ln-srf-script.patch
package/cups-filters/0001-Build-system-add-missing-ln-srf-script.patch new file +71 -0
@@ -0,0 +1,71 @@ +From 6f6fb88077bce7f9dd9d21a286eeec700acff04e Mon Sep 17 00:00:00 2001 +From: Carlos Santos <[email protected]> +Date: Mon, 16 Sep 2019 22:22:37 -0300 +Subject: [PATCH] Build system:: add missing ln-srf script + +It is missing in the 1.25.6 release tarball. + +Signed-off-by: Carlos Santos <[email protected]> +--- + ln-srf | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 49 insertions(+) + create mode 100755 ln-srf + +diff --git a/ln-srf b/ln-srf +new file mode 100755 +index 00000000..f395a760 +--- /dev/null ++++ b/ln-srf +@@ -0,0 +1,49 @@ ++#!/bin/sh ++# ++# Author: Carlos Santos <[email protected]> ++# This file is in public domain. ++# ++ ++error() { ++ echo "$@" 1>&2 ++ exit 1 ++} ++ ++src="$1" ++dst="$2" ++ ++check_path() { ++ case "$2" in ++ */../*|*/./*|*/.|*/..) error "$1 path '$2' must be absolute";; ++ */) error "$1 path '$2' must not end with '/'";; ++ /?*) ;; ++ *) error "$1 path '$2' must start with '/'";; ++ esac ++} ++ ++check_path "source" "$src" ++check_path "destination" "$dst" ++ ++# strip leading '/' ++src=${src#/*} ++tmp=${dst#/*} ++ ++s_prefix=${src%%/*} ++d_prefix=${tmp%%/*} ++ ++# strip leading common ++while [ "$s_prefix" = "$d_prefix" ]; do ++ src="${src#$s_prefix/}" ++ tmp="${tmp#$d_prefix/}" ++ s_prefix=${src%%/*} ++ d_prefix=${tmp%%/*} ++done ++ ++s_prefix="../" ++while [ -n "$d_prefix" ] && [ "$tmp" != "$d_prefix" ]; do ++ s_prefix="../$s_prefix" ++ tmp="${tmp#$d_prefix/}" ++ d_prefix=${tmp%%/*} ++done ++ ++ln -s -f "$s_prefix$src" "$dst" +-- +2.18.1 +
package/cups-filters/cups-filters.mk +9 -0
@@ -20,6 +20,15 @@ CUPS_FILTERS_CONF_OPTS = --disable-imagefilters \ --with-pdftops=pdftops \ --with-jpeg +# 0001-Build-system-add-missing-ln-srf-script.patch adds a ln-srf script +# for older distributions, but GNU patch < 2.7 does not handle the git +# patch permission extensions - So ensure it is executable +define CUPS_FILTERS_MAKE_LN_SRF_EXECUTABLE + chmod +x $(@D)/ln-srf +endef + +CUPS_FILTERS_POST_PATCH_HOOKS += CUPS_FILTERS_MAKE_LN_SRF_EXECUTABLE + ifeq ($(BR2_PACKAGE_LIBPNG),y) CUPS_FILTERS_CONF_OPTS += --with-png CUPS_FILTERS_DEPENDENCIES += libpng
Signature · 1 line
2.18.1
PATCH 2/2 package/cups-filters: fix ln -r workaround for older distributions
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"unixmania" == unixmania <[email protected]> writes:
From: Carlos Santos <[email protected]>
Add a patch to create the ln-srf script that was not included in the 1.25.6 release tarball. Also add a post-patch hook to ensure that the script executable, since but GNU patch < 2.7 does not handle the git patch permission extensions.
Quoted 4 lines
Fixes:
http://autobuild.buildroot.net/results/c78e7d6d703b1b48ba19d8c4fae32b4e4489cb43/Signed-off-by Carlos Santos <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard