diff options
| author | mandree <mandree@FreeBSD.org> | 2012-05-10 01:55:01 +0800 |
|---|---|---|
| committer | mandree <mandree@FreeBSD.org> | 2012-05-10 01:55:01 +0800 |
| commit | 4e4b27a39c02b4ae795ae4aff305badfd26f3a40 (patch) | |
| tree | a2f0dd889d3915519f035a240dae3347f85b9b3f /sysutils | |
| parent | cbd98607fbf434954c102398f7440cc8e83c253f (diff) | |
| download | freebsd-ports-graphics-4e4b27a39c02b4ae795ae4aff305badfd26f3a40.tar.gz freebsd-ports-graphics-4e4b27a39c02b4ae795ae4aff305badfd26f3a40.tar.zst freebsd-ports-graphics-4e4b27a39c02b4ae795ae4aff305badfd26f3a40.zip | |
Add a patch to MAKE_JOBS_SAFE.
The patch, and one removing bashisms in tests/*/script, have been submitted
to Ted Y. Ts'o, the upstream maintainer, for inclusion in the next release.
Reported by: pointyhat (by way of pav@)
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/e2fsprogs/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/e2fsprogs/files/patch-parallel-make | 42 |
2 files changed, 43 insertions, 1 deletions
diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile index baa10e259ac..a207e96267d 100644 --- a/sysutils/e2fsprogs/Makefile +++ b/sysutils/e2fsprogs/Makefile @@ -43,7 +43,7 @@ post-extract: PKGDEINSTALL= ${PKGINSTALL} -MAKE_JOBS_UNSAFE= yes +MAKE_JOBS_SAFE= yes # get more details into tinderbox logs .if defined(PACKAGE_BUILDING) diff --git a/sysutils/e2fsprogs/files/patch-parallel-make b/sysutils/e2fsprogs/files/patch-parallel-make new file mode 100644 index 00000000000..d4d8bd0994d --- /dev/null +++ b/sysutils/e2fsprogs/files/patch-parallel-make @@ -0,0 +1,42 @@ +From 0abb581fe2ab23813ea57efa11fd82fbb3bc8414 Mon Sep 17 00:00:00 2001 +From: Matthias Andree <matthias.andree@gmx.de> +Date: Wed, 9 May 2012 19:43:52 +0200 +Subject: [PATCH 2/2] Fix parallel (make -j) build. + +Add a few dependencies where needed, so that "make -j17 check" now works. + +Signed-off-by: Matthias Andree <matthias.andree@gmx.de> +--- + Makefile.in | 2 ++ + lib/uuid/Makefile.in | 2 +- + 2 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 7c5d441..544ed02 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -73,6 +73,8 @@ install-libs: install-libs-recursive + + uninstall-libs: uninstall-libs-recursive + ++check-recursive: all ++ + TAGS clean-recursive distclean-recursive depend-recursive check-recursive \ + mostlyclean-recursive realclean-recursive: + @for subdir in $(SUBDIRS); do \ +diff --git a/lib/uuid/Makefile.in b/lib/uuid/Makefile.in +index b85c720..caa13f7 100644 +--- a/lib/uuid/Makefile.in ++++ b/lib/uuid/Makefile.in +@@ -76,7 +76,7 @@ uuid.h: $(srcdir)/uuid.h.in + $(top_builddir)/lib/uuid/uuid_types.h: $(srcdir)/uuid_types.h.in $(top_builddir)/config.status + cd $(top_builddir); CONFIG_FILES=$(my_dir)/uuid_types.h ./config.status + +-tst_uuid.o: $(srcdir)/tst_uuid.c ++tst_uuid.o: $(srcdir)/tst_uuid.c uuid.h + $(E) " CC $@" + $(Q) $(CC) $(ALL_CFLAGS) -c $(srcdir)/tst_uuid.c -o tst_uuid.o + +-- +1.7.4.1 + |