Author: des
Date: Sat Apr 12 12:44:09 2014
New Revision: 264367
URL: http://svnweb.freebsd.org/changeset/base/264367

Log:
  Introduce RANLIBFLAGS to mirror ARFLAGS and add -D to both.  This sets
  all timestamps in static libraries to 0 so that consecutive builds
  from the same source, even on different machines, produce identical
  libraries.
  
  MFC after:    3 weeks

Modified:
  head/gnu/lib/libgcc/Makefile
  head/share/mk/bsd.lib.mk
  head/share/mk/sys.mk

Modified: head/gnu/lib/libgcc/Makefile
==============================================================================
--- head/gnu/lib/libgcc/Makefile        Sat Apr 12 06:50:11 2014        
(r264366)
+++ head/gnu/lib/libgcc/Makefile        Sat Apr 12 12:44:09 2014        
(r264367)
@@ -352,7 +352,7 @@ libgcc_eh.a:        ${EH_OBJS_T}
        @${ECHO} building static gcc_eh library
        @rm -f ${.TARGET}
        @${AR} ${ARFLAGS} ${.TARGET} `lorder ${EH_OBJS_T} | tsort -q`
-       ${RANLIB} ${.TARGET}
+       ${RANLIB} ${RANLIBFLAGS} ${.TARGET}
 
 all:   libgcc_eh.a
 
@@ -361,7 +361,7 @@ libgcc_eh_p.a:      ${EH_OBJS_P}
        @${ECHO} building profiled gcc_eh library
        @rm -f ${.TARGET}
        @${AR} ${ARFLAGS} ${.TARGET} `lorder ${EH_OBJS_P} | tsort -q`
-       ${RANLIB} ${.TARGET}
+       ${RANLIB} ${RANLIBFLAGS} ${.TARGET}
 all:   libgcc_eh_p.a
 .endif
 

Modified: head/share/mk/bsd.lib.mk
==============================================================================
--- head/share/mk/bsd.lib.mk    Sat Apr 12 06:50:11 2014        (r264366)
+++ head/share/mk/bsd.lib.mk    Sat Apr 12 12:44:09 2014        (r264367)
@@ -172,7 +172,7 @@ lib${LIB}.a: ${OBJS} ${STATICOBJS}
 .else
        @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | 
tsort -q` ${ARADD}
 .endif
-       ${RANLIB} ${.TARGET}
+       ${RANLIB} ${RANLIBFLAGS} ${.TARGET}
 .endif
 
 .if !defined(INTERNALLIB)
@@ -189,7 +189,7 @@ lib${LIB}_p.a: ${POBJS}
 .else
        @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` 
${ARADD}
 .endif
-       ${RANLIB} ${.TARGET}
+       ${RANLIB} ${RANLIBFLAGS} ${.TARGET}
 .endif
 
 .if defined(SHLIB_NAME) || \
@@ -246,7 +246,7 @@ lib${LIB}_pic.a: ${SOBJS}
        @${ECHO} building special pic ${LIB} library
        @rm -f ${.TARGET}
        @${AR} ${ARFLAGS} ${.TARGET} ${SOBJS} ${ARADD}
-       ${RANLIB} ${.TARGET}
+       ${RANLIB} ${RANLIBFLAGS} ${.TARGET}
 .endif
 
 .if defined(WANT_LINT) && !defined(NO_LINT) && defined(LIB) && !empty(LIB)

Modified: head/share/mk/sys.mk
==============================================================================
--- head/share/mk/sys.mk        Sat Apr 12 06:50:11 2014        (r264366)
+++ head/share/mk/sys.mk        Sat Apr 12 12:44:09 2014        (r264367)
@@ -39,9 +39,12 @@ AR           ?=      ar
 .if defined(%POSIX)
 ARFLAGS                ?=      -rv
 .else
-ARFLAGS                ?=      cru
+ARFLAGS                ?=      -crD
 .endif
 RANLIB         ?=      ranlib
+.if !defined(%POSIX)
+RANLIBFLAGS    ?=      -D
+.endif
 
 AS             ?=      as
 AFLAGS         ?=
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to