blob: 3b2d7a64ed9f2107215897820151c7b23f2fac28 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
From 29b37e6e7ff7ba101cd90b7c02b1616bf648a4ea Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@debian.org>
Date: Tue, 9 Aug 2016 18:11:25 +0200
Subject: Do not link libcups.so and libcupsimage.so against
unnecessary libraries. This avoids unnecessary package dependencies for
both libcups, as well as for packages using cups-config.
Bug: https://www.cups.org/str.php?L4343
Bug-Debian: http://bugs.debian.org/438067
Last-Update: 2015-10-02
Patch-Name: drop_unnecessary_dependencies.patch
---
Makedefs.in | 2 +-
cups/Makefile | 4 ++--
filter/Makefile | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makedefs.in b/Makedefs.in
index 332a12742..e9770ca14 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -134,7 +134,7 @@ DBUS_NOTIFIER = @DBUS_NOTIFIER@
DBUS_NOTIFIERLIBS = @DBUS_NOTIFIERLIBS@
DNSSD_BACKEND = @DNSSD_BACKEND@
DSOFLAGS = -L../cups @DSOFLAGS@
-DSOLIBS = @DSOLIBS@ $(COMMONLIBS)
+DSOLIBS = @DSOLIBS@
DNSSDLIBS = @DNSSDLIBS@
IPPFIND_BIN = @IPPFIND_BIN@
IPPFIND_MAN = @IPPFIND_MAN@
diff --git a/cups/Makefile b/cups/Makefile
index ba9bbed4b..9edd76e9c 100644
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -311,7 +311,7 @@ uninstall:
libcups.so.2: $(LIBOBJS)
echo Linking $@...
$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LIBGSSAPI) \
- $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+ $(SSLLIBS) $(DNSSDLIBS) -lpthread $(LIBZ) -lm
$(RM) `basename $@ .2`
$(LN) $@ `basename $@ .2`
@@ -333,7 +333,7 @@ libcups.2.dylib: $(LIBOBJS) $(LIBCUPSORDER)
-compatibility_version 2.0.0 \
-exported_symbols_list t.exp \
$(LIBOBJS) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
- $(COMMONLIBS) $(LIBZ)
+ -lpthread $(LIBZ) -lm
$(RM) libcups.dylib t.exp
$(LN) $@ libcups.dylib
diff --git a/filter/Makefile b/filter/Makefile
index 152bc90cf..ebf57201d 100644
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -235,7 +235,7 @@ gziptoany: gziptoany.o ../Makedefs ../cups/$(LIBCUPS)
libcupsimage.so.2 libcupsimage.sl.2: $(IMAGEOBJS)
echo Linking $@...
$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) \
- -L../cups $(LINKCUPS)
+ -L../cups $(LINKCUPS) -lpthread
$(RM) `basename $@ .2`
$(LN) $@ `basename $@ .2`
|
