Move all to deprecated folder.
This commit is contained in:
@@ -0,0 +1,48 @@
|
||||
src/xml: use preg-gen xmli18n_tmp.h if specified
|
||||
|
||||
Ideally, the programs needed at build-time should be built with
|
||||
CC_FOR_BUILD, and not with CC_FOR_HOST.
|
||||
|
||||
Unfortunately, this program wants to link against the gutenprint libs,
|
||||
so we would also need to build them with CC_FOR_HOST, that is build them
|
||||
twice, once for build, once for host.
|
||||
|
||||
Instead, in the Buildroot context, we first build gutenprint for the build
|
||||
system, use that to generate the incriminated header, and then re-use that
|
||||
header to build the gutenprint for the host.
|
||||
|
||||
It is not possible to have such constructs in Makefile.am:
|
||||
ifeq ($(FOO),)
|
||||
bar: bla
|
||||
cat $< >$@
|
||||
else
|
||||
bar:
|
||||
echo $(FOO) >$@
|
||||
endif
|
||||
|
||||
as autoreconf will yell loudly that there is an 'endif' without an 'if'.
|
||||
Sigh... :-(
|
||||
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
|
||||
diff -durN gutenprint-5.2.9.orig/src/xml/Makefile.am gutenprint-5.2.9/src/xml/Makefile.am
|
||||
--- gutenprint-5.2.9.orig/src/xml/Makefile.am 2011-03-30 02:43:24.000000000 +0200
|
||||
+++ gutenprint-5.2.9/src/xml/Makefile.am 2013-03-24 17:08:08.435918773 +0100
|
||||
@@ -52,10 +52,13 @@
|
||||
|
||||
|
||||
xmli18n-tmp.h: xml-stamp extract-strings
|
||||
- -rm -f $@ $@.tmp
|
||||
- ./extract-strings `cat xml-stamp | sed -e 's;^;$(srcdir)/;'` > $@.tmp
|
||||
- mv $@.tmp $@
|
||||
-
|
||||
+ if [ -z "$(BR2_USE_PREGEN_XMLI18N_TMP_H)" ]; then \
|
||||
+ rm -f $@ $@.tmp; \
|
||||
+ ./extract-strings `cat xml-stamp | sed -e 's;^;$(srcdir)/;'` > $@.tmp; \
|
||||
+ mv $@.tmp $@; \
|
||||
+ else \
|
||||
+ cp $(BR2_USE_PREGEN_XMLI18N_TMP_H) $@; \
|
||||
+ fi
|
||||
|
||||
dist-hook: xmli18n-tmp.h xml-stamp
|
||||
# xmli18n-tmp.h is needed by po/POTFILES.in at dist time
|
||||
@@ -0,0 +1,39 @@
|
||||
From 08a5d355160eb2ac8346ae1b94591418343217f9 Mon Sep 17 00:00:00 2001
|
||||
From: Romain Naour <romain.naour@openwide.fr>
|
||||
Date: Sun, 17 Aug 2014 23:43:20 +0200
|
||||
Subject: [PATCH 1/1] cups support: replaces -static with -static-libtool-libs
|
||||
|
||||
gutenprint rely on the original behaviour of -static, but since commit
|
||||
in buildroot "support/libtool: make -static behave like -all-static" [1],
|
||||
the build of genppd is broken.
|
||||
|
||||
genppd need to be build statically otherwise the following warning appears:
|
||||
***WARNING: Use of --disable-static-genppd or --disable-static
|
||||
when building CUPS is very dangerous. The build may
|
||||
fail when building the PPD files, or may *SILENTLY*
|
||||
build incorrect PPD files or cause other problems.
|
||||
Please review the README and release notes carefully!
|
||||
|
||||
[1] http://git.buildroot.net/buildroot/commit/?id=97703978ac870ce2b14ad144f8e082de82aa2c64
|
||||
|
||||
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
|
||||
---
|
||||
src/cups/Makefile.am | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/cups/Makefile.am b/src/cups/Makefile.am
|
||||
index 1e27ae0..d711b70 100644
|
||||
--- a/src/cups/Makefile.am
|
||||
+++ b/src/cups/Makefile.am
|
||||
@@ -84,7 +84,7 @@ noinst_SCRIPTS=test-rastertogutenprint
|
||||
endif
|
||||
|
||||
if BUILD_GENPPD_STATIC
|
||||
-STATIC_LDOPTS=-static -export-dynamic
|
||||
+STATIC_LDOPTS=-static-libtool-libs -export-dynamic
|
||||
endif
|
||||
|
||||
cups_calibrate_SOURCES = cups-calibrate.c
|
||||
--
|
||||
1.9.3
|
||||
|
||||
17
deprecated/firmware/buildroot/package/gutenprint/Config.in
Normal file
17
deprecated/firmware/buildroot/package/gutenprint/Config.in
Normal file
@@ -0,0 +1,17 @@
|
||||
config BR2_PACKAGE_GUTENPRINT
|
||||
bool "gutenprint"
|
||||
# because of cups security issues
|
||||
depends on BR2_DEPRECATED_SINCE_2015_05
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_PACKAGE_CUPS
|
||||
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
|
||||
help
|
||||
Gutenprint, formerly named Gimp-Print, is a suite of printer
|
||||
drivers that may be used with most common UNIX print spooling
|
||||
systems, including CUPS, lpr, LPRng, or others
|
||||
|
||||
http://gimp-print.sourceforge.net/
|
||||
|
||||
comment "gutenprint needs a toolchain w/ C++"
|
||||
depends on BR2_PACKAGE_CUPS
|
||||
depends on !BR2_INSTALL_LIBSTDCPP
|
||||
@@ -0,0 +1,2 @@
|
||||
# Locally computed:
|
||||
sha256 4b27e4f06f32d30271df89ecb6089bb11bcf2caec5f60b0909e083095354bca0 gutenprint-5.2.9.tar.bz2
|
||||
@@ -0,0 +1,92 @@
|
||||
################################################################################
|
||||
#
|
||||
# gutenprint
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GUTENPRINT_VERSION_MAJOR = 5.2
|
||||
GUTENPRINT_VERSION = $(GUTENPRINT_VERSION_MAJOR).9
|
||||
GUTENPRINT_SITE = http://downloads.sourceforge.net/project/gimp-print/gutenprint-$(GUTENPRINT_VERSION_MAJOR)/$(GUTENPRINT_VERSION)
|
||||
GUTENPRINT_SOURCE = gutenprint-$(GUTENPRINT_VERSION).tar.bz2
|
||||
GUTENPRINT_LICENSE = GPLv2+
|
||||
GUTENPRINT_LICENSE_FILES = COPYING
|
||||
|
||||
# Needed, as we touch Makefile.am
|
||||
GUTENPRINT_AUTORECONF = YES
|
||||
|
||||
GUTENPRINT_DEPENDENCIES = \
|
||||
cups host-pkgconf \
|
||||
$(if $(BR2_PACKAGE_LIBICONV),libiconv)
|
||||
|
||||
# host-gutenprint is needed to generate XML as part of compilation
|
||||
# the program that generates the xml also links against libgutenprint
|
||||
# so we need to build both a host package and a target package
|
||||
GUTENPRINT_DEPENDENCIES += host-gutenprint
|
||||
|
||||
GUTENPRINT_CONF_ENV = \
|
||||
ac_cv_path_CUPS_CONFIG=$(STAGING_DIR)/usr/bin/cups-config \
|
||||
ac_cv_path_IJS_CONFIG=""
|
||||
|
||||
GUTENPRINT_CONF_OPTS = \
|
||||
--disable-libgutenprintui2 \
|
||||
--disable-samples \
|
||||
--without-doc \
|
||||
--without-gimp2 \
|
||||
--without-foomatic \
|
||||
--without-foomatic3 \
|
||||
--disable-escputil \
|
||||
--disable-test \
|
||||
--disable-testpattern \
|
||||
--with-cups="/usr" \
|
||||
--with-sysroot="$(STAGING_DIR)" \
|
||||
--disable-cups-ppds
|
||||
|
||||
# USE_PREGEN_XMLI18N_TMP_H is added by our patch
|
||||
GUTENPRINT_MAKE_ENV = BR2_USE_PREGEN_XMLI18N_TMP_H=$(HOST_DIR)/usr/include/xmli18n-tmp.h
|
||||
|
||||
# We have no host dependencies
|
||||
HOST_GUTENPRINT_DEPENDENCIES =
|
||||
# The host-gutenprint shall create the required header
|
||||
HOST_GUTENPRINT_MAKE_ENV =
|
||||
|
||||
# Even with --without-cups, gutenprint will still add the output of
|
||||
# cups-config --cflags / --ldflags to it's compiler/linker flags if
|
||||
# available on host.
|
||||
# Notice: Because of the configure logic, it needs to be set to the
|
||||
# empty string to to disable this, not just to /bin/false like elsewhere.
|
||||
HOST_GUTENPRINT_CONF_ENV = ac_cv_path_CUPS_CONFIG=''
|
||||
|
||||
HOST_GUTENPRINT_CONF_OPTS = \
|
||||
--disable-libgutenprintui2 \
|
||||
--disable-samples \
|
||||
--without-gimp2 \
|
||||
--without-doc \
|
||||
--disable-nls \
|
||||
--disable-nls-macos \
|
||||
--without-foomatic \
|
||||
--without-foomatic3 \
|
||||
--disable-escputil \
|
||||
--disable-test \
|
||||
--disable-testpattern \
|
||||
--without-cups
|
||||
|
||||
# Needed by autoreconf
|
||||
define GUTENPRINT_CREATE_M4_DIR
|
||||
mkdir -p $(@D)/m4local
|
||||
endef
|
||||
GUTENPRINT_POST_PATCH_HOOKS += GUTENPRINT_CREATE_M4_DIR
|
||||
HOST_GUTENPRINT_POST_PATCH_HOOKS += GUTENPRINT_CREATE_M4_DIR
|
||||
|
||||
define HOST_GUTENPRINT_POST_BUILD_INSTAL_TMP_HEADER
|
||||
cp $(@D)/src/xml/xmli18n-tmp.h $(HOST_DIR)/usr/include
|
||||
endef
|
||||
HOST_GUTENPRINT_POST_BUILD_HOOKS += HOST_GUTENPRINT_POST_BUILD_INSTAL_TMP_HEADER
|
||||
|
||||
define GUTENPRINT_POST_INSTALL_TARGET_FIXUP
|
||||
mkdir -p $(TARGET_DIR)/usr/share/gutenprint/5.2
|
||||
cp -rf $(HOST_DIR)/usr/share/gutenprint/5.2/xml $(TARGET_DIR)/usr/share/gutenprint/5.2
|
||||
endef
|
||||
GUTENPRINT_POST_INSTALL_TARGET_HOOKS += GUTENPRINT_POST_INSTALL_TARGET_FIXUP
|
||||
|
||||
$(eval $(autotools-package))
|
||||
$(eval $(host-autotools-package))
|
||||
Reference in New Issue
Block a user