pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/pkgsrc-2015Q1]: pkgsrc/pkgtools/libnbcompat/files Pullup ticket #4707...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2c7546d23c1d
branches:  pkgsrc-2015Q1
changeset: 649228:2c7546d23c1d
user:      hiramatsu <hiramatsu%pkgsrc.org@localhost>
date:      Fri May 08 18:33:01 2015 +0000

description:
Pullup ticket #4707 - requested by joerg
pkgtools/libnbcompat: build fix

Revisions pulled up:
- pkgtools/libnbcompat/files/Makefile.in                        1.37-1.39

---
   Module Name:    pkgsrc
   Committed By:   joerg
   Date:           Fri May  1 12:18:09 UTC 2015

   Modified Files:
           pkgsrc/pkgtools/libnbcompat/files: Makefile.in

   Log Message:
   Ensure that nbconfig.h is created before all object files, avoiding
   mysterious failures for parallel builds.

---
   Module Name:    pkgsrc
   Committed By:   ryoon
   Date:           Sat May  2 11:59:05 UTC 2015

   Modified Files:
           pkgsrc/pkgtools/libnbcompat/files: Makefile.in

   Log Message:
   Fix build failure on many platforms.

   The previous commit is obviously wrong because OBJS depends on LIB
   and LIB is generated from OBJS.

   And I can build this package with MAKE_JOBS=32.

---
   Module Name:    pkgsrc
   Committed By:   joerg
   Date:           Sat May  2 12:52:59 UTC 2015

   Modified Files:
           pkgsrc/pkgtools/libnbcompat/files: Makefile.in

   Log Message:
   Reapply 1.37, but split the dependencies correctly into the header and
   library dependency.

diffstat:

 pkgtools/libnbcompat/files/Makefile.in |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (19 lines):

diff -r 793e05bda7de -r 2c7546d23c1d pkgtools/libnbcompat/files/Makefile.in
--- a/pkgtools/libnbcompat/files/Makefile.in    Fri May 08 08:00:23 2015 +0000
+++ b/pkgtools/libnbcompat/files/Makefile.in    Fri May 08 18:33:01 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.36 2009/06/05 19:58:04 joerg Exp $
+# $NetBSD: Makefile.in,v 1.36.48.1 2015/05/08 18:33:01 hiramatsu Exp $
 #
 
 srcdir=                @srcdir@
@@ -71,7 +71,8 @@
 LINK=          $(CCLD) $(CFLAGS) $(LDFLAGS) -o $@
 COMPILE=       $(CC) $(CPPFLAGS) $(CFLAGS)
 
-all: nbcompat/nbconfig.h $(LIB)
+all: $(LIB)
+all $(OBJS): nbcompat/nbconfig.h
 
 .c.o:
        $(COMPILE) $(DEFS) -c $<



Home | Main Index | Thread Index | Old Index