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
|
diff -aur package.pristine/configure.ac package.new/configure.ac
--- package.pristine/configure.ac 2019-03-15 01:31:20.000000000 +0100
+++ package.new/configure.ac 2019-03-30 11:31:11.971579309 +0100
@@ -1347,6 +1347,7 @@
with_libcap="${withval}")
have_libcap=no
+LIBCAP_LIBS=""
case $host_os in
linux*)
if test "x$with_libcap" = "xyes"; then
@@ -1354,13 +1355,14 @@
AC_CHECK_HEADERS([sys/capability.h sys/prctl.h], , have_libcap=no)
if test "$have_libcap" = "yes"; then
AC_DEFINE(HAVE_LIBCAP, [], [Do we have libcap system capabilities handling (Linux systems only)?])
- LIBS="$LIBS -lcap"
+ LIBCAP_LIBS="-lcap"
fi
fi
;;
*)
;;
esac
+AC_SUBST(LIBCAP_LIBS)
AC_MSG_CHECKING(for libcap)
AC_MSG_RESULT($have_libcap)
diff -aur package.pristine/Makefile.am package.new/Makefile.am
--- package.pristine/Makefile.am 2019-03-15 01:31:20.000000000 +0100
+++ package.new/Makefile.am 2019-03-30 11:32:32.989988392 +0100
@@ -1433,7 +1433,7 @@
lib_libcyrus_min_la_SOURCES += lib/map_nommap.c
endif
endif
-lib_libcyrus_min_la_LIBADD = $(LTLIBOBJS) $(LIB_UUID) $(GCOV_LIBS)
+lib_libcyrus_min_la_LIBADD = $(LTLIBOBJS) $(LIB_UUID) $(GCOV_LIBS) $(LIBCAP_LIBS)
lib_libcyrus_min_la_CFLAGS = $(AM_CFLAGS) $(CFLAG_VISIBILITY)
lib/chartable.c: lib/mkchartable.pl lib/charset/unifix.txt \
diff -aur package.pristine/perl/imap/Makefile.PL.in package.new/perl/imap/Makefile.PL.in
--- package.pristine/perl/imap/Makefile.PL.in 2019-03-15 01:31:20.000000000 +0100
+++ package.new/perl/imap/Makefile.PL.in 2019-03-30 11:33:50.351117737 +0100
@@ -90,7 +90,7 @@
'clean' => {'FILES' => 'libcyrperl.a cyradm'},
'OBJECT' => 'IMAP.o',
'MYEXTLIB' => '@top_builddir@/perl/.libs/libcyrus.a @top_builddir@/perl/.libs/libcyrus_min.a',
- 'LIBS' => [ "$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @ZLIB@"],
+ 'LIBS' => [ "$LIB_SASL @SSL_LIBS@ @LIB_UUID@ @ZLIB@ @LIBCAP_LIBS@"],
'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING'
'INC' => "-I@top_srcdir@ -I@top_srcdir@/com_err/et @SASLFLAGS@ @SSL_CPPFLAGS@ -I@top_srcdir@/perl/imap",
'EXE_FILES' => [cyradm],
|