Update buidlroot to version 2016.08.1
This commit is contained in:
@@ -1,21 +1,18 @@
|
||||
From a77bb18a5584bb23687ed3c522dbd91a9987d5a7 Mon Sep 17 00:00:00 2001
|
||||
From: Olivier Schonken <olivier.schonken@gmail.com>
|
||||
Date: Wed, 20 Jan 2016 22:13:11 +0200
|
||||
From 6bc1d15250841cf17d307cfb4f35c960c23d8797 Mon Sep 17 00:00:00 2001
|
||||
From: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
Date: Sun, 29 May 2016 19:31:50 +0200
|
||||
Subject: [PATCH] Remove man from BUILDDIRS in configure
|
||||
|
||||
Since cups doesn't autoreconf properly, we directly patch the
|
||||
configure script.
|
||||
|
||||
Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
configure | 2 +-
|
||||
config-scripts/cups-common.m4 | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 4170ff3..3879a75 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -5921,7 +5921,7 @@ fi
|
||||
diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
|
||||
index fbba715..77d0f5c 100644
|
||||
--- a/config-scripts/cups-common.m4
|
||||
+++ b/config-scripts/cups-common.m4
|
||||
@@ -446,7 +446,7 @@ AC_ARG_WITH(components, [ --with-components set components to build:
|
||||
|
||||
case "$COMPONENTS" in
|
||||
all)
|
||||
@@ -25,5 +22,5 @@ index 4170ff3..3879a75 100755
|
||||
|
||||
core)
|
||||
--
|
||||
2.5.0
|
||||
2.8.1
|
||||
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
From b341a1e1fce48012fc5bcf39337488fd33210616 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Sun, 3 Jul 2016 12:20:21 +0200
|
||||
Subject: [PATCH] Remove PIE flags from the build
|
||||
|
||||
Generating a statically linked binary built with PIE requires the
|
||||
Scrt1.o file, which isn't part of Buildroot uClibc toolchains. To
|
||||
solve this, we simply disable the PIE flags.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
Makedefs.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makedefs.in b/Makedefs.in
|
||||
index 3afef0a..299b297 100644
|
||||
--- a/Makedefs.in
|
||||
+++ b/Makedefs.in
|
||||
@@ -142,7 +142,7 @@ IPPFIND_BIN = @IPPFIND_BIN@
|
||||
IPPFIND_MAN = @IPPFIND_MAN@
|
||||
LDFLAGS = -L../cgi-bin -L../cups -L../filter -L../ppdc \
|
||||
-L../scheduler @LDARCHFLAGS@ \
|
||||
- @LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
|
||||
+ @LDFLAGS@ @RELROFLAGS@ $(OPTIM)
|
||||
LINKCUPS = @LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(LIBZ)
|
||||
LINKCUPSIMAGE = @LINKCUPSIMAGE@
|
||||
LIBS = $(LINKCUPS) $(COMMONLIBS)
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
From 79a2389f590f4d16885bdd0715f3f04fd9fa6cc5 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
|
||||
Date: Sun, 28 Feb 2016 16:35:56 +0100
|
||||
Subject: [PATCH] Fix static linking with GnuTLS
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
cups forgets to link against the libs found by pkg-config if it is build with
|
||||
GnuTLS support.
|
||||
|
||||
Otherwise, static build fails with:
|
||||
../cups/libcups.a(tls.o): In function `http_gnutls_create_credential':
|
||||
cups-2.1.2/cups/tls-gnutls.c:762: undefined reference to `gnutls_x509_crt_init'
|
||||
[..]
|
||||
|
||||
Status upstream: Pending
|
||||
|
||||
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
||||
---
|
||||
Makedefs.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makedefs.in b/Makedefs.in
|
||||
index 299b297..ce9d535 100644
|
||||
--- a/Makedefs.in
|
||||
+++ b/Makedefs.in
|
||||
@@ -143,7 +143,7 @@ IPPFIND_MAN = @IPPFIND_MAN@
|
||||
LDFLAGS = -L../cgi-bin -L../cups -L../filter -L../ppdc \
|
||||
-L../scheduler @LDARCHFLAGS@ \
|
||||
@LDFLAGS@ @RELROFLAGS@ $(OPTIM)
|
||||
-LINKCUPS = @LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(LIBZ)
|
||||
+LINKCUPS = @LINKCUPS@ $(SSLLIBS) $(LIBGSSAPI) $(DNSSDLIBS) $(LIBZ)
|
||||
LINKCUPSIMAGE = @LINKCUPSIMAGE@
|
||||
LIBS = $(LINKCUPS) $(COMMONLIBS)
|
||||
ONDEMANDFLAGS = @ONDEMANDFLAGS@
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally calculated:
|
||||
sha256 bab0ca3ba80eae48319b3a6b19a5b14fad5ce230f30151a0cfa4c0271df281ad cups-2.1.2-source.tar.bz2
|
||||
sha256 4b14fd833180ac529ebebea766a09094c2568bf8426e219cb3a1715304ef728d cups-2.1.4-source.tar.gz
|
||||
|
||||
@@ -4,15 +4,21 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
CUPS_VERSION = 2.1.2
|
||||
CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.bz2
|
||||
CUPS_SITE = http://www.cups.org/software/$(CUPS_VERSION)
|
||||
CUPS_VERSION = 2.1.4
|
||||
CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz
|
||||
CUPS_SITE = https://github.com/apple/cups/releases/download/release-$(CUPS_VERSION)
|
||||
CUPS_LICENSE = GPLv2 LGPLv2
|
||||
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
|
||||
|
||||
# Using autoconf, not autoheader, so we cannot use AUTORECONF = YES.
|
||||
define CUPS_RUN_AUTOCONF
|
||||
cd $(@D); $(HOST_DIR)/usr/bin/autoconf -f
|
||||
endef
|
||||
CUPS_PRE_CONFIGURE_HOOKS += CUPS_RUN_AUTOCONF
|
||||
|
||||
CUPS_CONF_OPTS = \
|
||||
--without-perl \
|
||||
--without-java \
|
||||
@@ -21,6 +27,7 @@ CUPS_CONF_OPTS = \
|
||||
--libdir=/usr/lib
|
||||
CUPS_CONFIG_SCRIPTS = cups-config
|
||||
CUPS_DEPENDENCIES = \
|
||||
host-autoconf \
|
||||
$(if $(BR2_PACKAGE_ZLIB),zlib)
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SYSTEMD),y)
|
||||
|
||||
Reference in New Issue
Block a user