mirror of
https://salsa.debian.org/srivasta/make-dfsg.git
synced 2024-10-23 12:49:59 +00:00
9ad3957dc4
* Pull back some patches from upstream git that fix bugs. One of these converts the mixed implicit and explicit rule error into a warning, and that should give us a grace period to fix the Makefiles, * Bug fix: "FTBFS with make 3.82 from experimental", thanks to Daniel Schepler. This package was not reported broken in the archive rebuild: see http://aws-logs.debian.net/ftbfs-logs/results-make4/ (Closes: #720686). * Bug fix: "make 3.82: with -j tries to run receipes without prerequisites yet done", thanks to Bernhard R. Link. This was not seen in the archive rebuild, and the upstream report has ben closed a being fixed in 4.0 (Closes: #722520). * Bug fix: "run dh-autoreconf to update config.{sub,guess} and {libtool,aclocal}.m4", thanks to Wookey. We now do indeed run autoreconf. (Closes: #689626). * Bug fix: "spurious circular dependency", thanks to Frank Heckenbach Bug fixed in new version. (Closes: #669968). * Bug fix: "make 3.82: fails to parse archive syntax", thanks to Andrew Shadura (Closes: #675612). * Bug fix: "binary package make lacks "Multi-Arch: foreign" declaration", thanks to Helmut Grohne (Closes: #693926). * Bug fix: "make 3.82 breaks kernel module build: 'mixed implicit and normal rules' in linux-headers-*", thanks to Dean Loros (Closes: #635317). * Bug fix: "please package upstream version 4.0", thanks to Andrew Shadura (Closes: #734387). * Bug fix: "optionally echo all commands, even if preceded with @", thanks to Vincent Lefevre (Closes: #451092). * Bug fix: ""Make is a HUGE memory hog"", thanks to Matthias Klose (Closes: #342726).
69 lines
2.1 KiB
Diff
69 lines
2.1 KiB
Diff
From 601714947082bf11e01db7765b4329aae9148c26 Mon Sep 17 00:00:00 2001
|
|
From: Manoj Srivastava <srivasta@golden-gryphon.com>
|
|
Date: Mon, 28 Apr 2014 23:19:46 -0700
|
|
Subject: [PATCH 1/7] debcherry fixup patch
|
|
|
|
147ab2d git-archimport-id: srivasta@debian.org--lenny/make-dfsg--debian--3.81--patch-3
|
|
- no changes against upstream or conflicts
|
|
1d865a1 [topic--multi-arch]: NMU changes from Steve Langaseck to support multi-arch.
|
|
- extra changes or conflicts
|
|
---
|
|
Makefile.am | 2 +-
|
|
remake.c | 18 ++++++++++++++++--
|
|
2 files changed, 17 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/Makefile.am b/Makefile.am
|
|
index 4c07f70..e3bbe57 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -63,7 +63,7 @@ endif
|
|
|
|
man_MANS = make.1
|
|
|
|
-DEFS = -DLOCALEDIR=\"$(localedir)\" -DLIBDIR=\"$(libdir)\" -DINCLUDEDIR=\"$(includedir)\" @DEFS@
|
|
+DEFS = -DLOCALEDIR=\"$(localedir)\" -DLIBDIR=\"$(libdir)\" -DINCLUDEDIR=\"$(includedir)\" -DMULTIARCH_DIRS="$(MULTIARCH_DIRS)" @DEFS@
|
|
|
|
AM_CPPFLAGS = $(GLOBINC)
|
|
AM_CFLAGS = $(GUILE_CFLAGS)
|
|
diff --git a/remake.c b/remake.c
|
|
index 138cdc6..d5386eb 100644
|
|
--- a/remake.c
|
|
+++ b/remake.c
|
|
@@ -1522,9 +1522,11 @@ library_search (const char *lib, FILE_TIMESTAMP *mtime_ptr)
|
|
{
|
|
static char *dirs[] =
|
|
{
|
|
+#ifdef MULTIARCH_DIRS
|
|
+ MULTIARCH_DIRS
|
|
+#endif
|
|
#ifndef _AMIGA
|
|
"/lib",
|
|
- "/usr/lib",
|
|
#endif
|
|
#if defined(WINDOWS32) && !defined(LIBDIR)
|
|
/*
|
|
@@ -1533,7 +1535,19 @@ library_search (const char *lib, FILE_TIMESTAMP *mtime_ptr)
|
|
*/
|
|
#define LIBDIR "."
|
|
#endif
|
|
- LIBDIR, /* Defined by configuration. */
|
|
+ LIBDIR, /* Defined by configuration. */
|
|
+#ifndef _AMIGA
|
|
+/*
|
|
+ * In the Debian binaries, PREFIX is /usr and thus this searches /lib,
|
|
+ * /usr/lib and /usr/lib again and therefore misses any libraries that
|
|
+ * are not packaged and were installed by the site admin. The ideal
|
|
+ * behaviour would be to have the search path set by a Makefile
|
|
+ * variable (other than the VPATH blunt object) but even absent that,
|
|
+ * it would be more useful if it looked in /usr/local/lib even though
|
|
+ * make itself hasn't been installed in the /usr/local tree -- manoj
|
|
+ */
|
|
+ "/usr/local/lib",
|
|
+#endif
|
|
0
|
|
};
|
|
|
|
--
|
|
2.0.0.rc0
|
|
|