Dario Binacchi
18b1197e91
Commit 8f88a644ed ("support/scripts/apply-patches.sh: set the maximum
fuzz factor to 0") reduced the fuzz factor.
Due to this change, monit fails to build with output:
Applying 0001-no-force-static.patch using patch:
patching file Makefile.am
Hunk #1 FAILED at 85.
1 out of 1 hunk FAILED -- saving rejects to file Makefile.am.rej
Applying 0002-configure.ac-fixes-missing-config-macro-dir.patch using patch:
patching file configure.ac
Hunk #1 FAILED at 8.
1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej
This commit refreshes the package patches on the current package version.
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
23 lines
773 B
Diff
23 lines
773 B
Diff
Do not force building a statically-linked binary
|
|
|
|
Statically-linked binary do not work well with glibc, because it
|
|
still dlopen()s the NSS libraries.
|
|
|
|
Reported-by: Peter Kümmel <syntheticpp@gmx.net>
|
|
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
|
[Dario: make the patch to be applied with fuzz factor 0]
|
|
Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
|
|
|
|
diff -durN monit-5.7.orig/Makefile.am monit-5.7/Makefile.am
|
|
--- monit-5.7.orig/Makefile.am 2014-02-20 09:00:42.000000000 +0100
|
|
+++ monit-5.7/Makefile.am 2014-09-05 12:49:43.711104001 +0200
|
|
@@ -97,7 +97,7 @@
|
|
src/statistics/Statistics.c
|
|
|
|
monit_LDADD = libmonit/libmonit.la
|
|
-monit_LDFLAGS = -static $(EXTLDFLAGS)
|
|
+monit_LDFLAGS = $(EXTLDFLAGS)
|
|
|
|
man_MANS = monit.1
|
|
|