• Skip to sidebar navigation
  • Skip to content

Bitbucket

  • More
    ProjectsRepositories
  • Help
    • Online help
    • Learn Git
    • Welcome to Bitbucket
    • Keyboard shortcuts
  • Log In
Alexander Dahl
  1. Alexander Dahl

buildroot

Public
Actions
  • Clone
  • Compare

Learn more about cloning repositories

You have read-only access

Navigation
  • Source
  • Commits
  • Branches
  • All Branches Graph
  • Forks
  1. Alexander Dahl
  2. buildroot

Source

buildroot/package/gutenprint/0004-build-Don-t-allow-USB-backends-to-be-built-if-CUPS-i.patch
Waldemar BrodkorbWaldemar Brodkorb committed b6a80dff87e17 Apr 2016
Raw file
Source viewDiff to previous
xxxxxxxxxx
 
1
From b5e8dc446572c1198a24eff105a394d0f307951e Mon Sep 17 00:00:00 2001
2
From: Solomon Peachy <pizza@shaftnet.org>
3
Date: Fri, 15 Apr 2016 23:05:43 -0400
4
Subject: [PATCH] build:  Don't allow USB backends to be built if CUPS is not
5
 enabled.
6
​
7
[Waldemar: backport from upstream commit
8
fc1713589fed645f2c8002c3f66dfb69af314716.]
9
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
10
---
11
 configure.ac | 14 ++++++++------
12
 1 file changed, 8 insertions(+), 6 deletions(-)
13
​
14
diff --git a/configure.ac b/configure.ac
15
index 800794b..ba30019 100644
16
--- a/configure.ac
17
+++ b/configure.ac
18
@@ -442,12 +442,14 @@ dnl if test -z "${[EXTRA_LIBREADLINE_DEPS]}" ; then
19
 dnl   [EXTRA_LIBREADLINE_DEPS]=""
20
 dnl fi
21
 
22
-# libusb-1.0 (For CUPS backends)
23
-PKG_CHECK_MODULES([LIBUSB], [libusb-1.0],
24
-                  [HAVE_LIBUSB=yes
25
-                   BUILD_LIBUSB_BACKENDS=yes],
26
-                  [HAVE_LIBUSB=no
27
-              BUILD_LIBUSB_BACKENDS=no])
28
+# libusb-1.0 (For CUPS backends, but only bother if CUPS is enabled)
29
+if test "x$BUILD_CUPS" = "xyes" ; then
30
+ PKG_CHECK_MODULES([LIBUSB], [libusb-1.0],
31
+                   [HAVE_LIBUSB=yes
32
+                    BUILD_LIBUSB_BACKENDS=yes],
33
+                   [HAVE_LIBUSB=no
34
+               BUILD_LIBUSB_BACKENDS=no])
35
+fi
36
 
37
 AC_PATH_PROGS([GIMPTOOL2_CHECK], [gimptool-2.0 gimptool])
38
 if test -z "${GIMPTOOL2_CHECK}" ; then
39
-- 
40
2.6.4
41
​
  • Git repository management for enterprise teams powered by Atlassian Bitbucket
  • Atlassian Bitbucket v6.7.2
  • Documentation
  • Request a feature
  • About
  • Contact Atlassian
Atlassian

Everything looks good. We'll let you know here if there's anything you should know about.