From owner-svn-src-all@FreeBSD.ORG Thu Dec 6 01:31:31 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7124CE00; Thu, 6 Dec 2012 01:31:31 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 52F728FC14; Thu, 6 Dec 2012 01:31:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB61VVUp028190; Thu, 6 Dec 2012 01:31:31 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB61VPPH028157; Thu, 6 Dec 2012 01:31:25 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201212060131.qB61VPPH028157@svn.freebsd.org> From: Eitan Adler Date: Thu, 6 Dec 2012 01:31:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r243933 - in head: contrib/binutils contrib/binutils/libiberty contrib/cvs/diff contrib/cvs/lib contrib/dtc contrib/gcc contrib/gcclibs/libcpp contrib/gcclibs/libdecnumber contrib/gccli... X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Dec 2012 01:31:31 -0000 Author: eadler Date: Thu Dec 6 01:31:25 2012 New Revision: 243933 URL: http://svnweb.freebsd.org/changeset/base/243933 Log: Clean up hardcoded ar(1) flags in the tree to use the global ARFLAGS in share/mk/sys.mk instead. This is part of a medium term project to permit deterministic builds of FreeBSD. Submitted by: Erik Cederstrand Reviewed by: imp, toolchain@ Approved by: cperciva MFC after: 2 weeks Modified: head/contrib/binutils/Makefile.in head/contrib/binutils/Makefile.tpl head/contrib/binutils/libiberty/Makefile.in head/contrib/cvs/diff/Makefile.in head/contrib/cvs/lib/Makefile.in head/contrib/dtc/Makefile head/contrib/gcc/Makefile.in head/contrib/gcclibs/libcpp/Makefile.in head/contrib/gcclibs/libdecnumber/Makefile.in head/contrib/gcclibs/libiberty/Makefile.in head/contrib/gdtoa/makefile head/contrib/gperf/lib/Makefile.in head/contrib/ntp/arlib/Makefile.in head/contrib/ntp/libntp/Makefile.in head/contrib/ntp/libparse/Makefile.in head/contrib/ntp/ntpd/Makefile.in head/contrib/opie/libmissing/Makefile.in head/contrib/opie/libopie/Makefile.in head/contrib/tcp_wrappers/Makefile head/contrib/tcpdump/Makefile.in head/crypto/heimdal/appl/ftp/common/Makefile.in head/crypto/heimdal/appl/telnet/libtelnet/Makefile.in head/crypto/openssl/Makefile.org head/crypto/openssl/crypto/Makefile head/gnu/lib/libgcc/Makefile head/gnu/usr.bin/cc/cc_tools/Makefile head/share/mk/bsd.lib.mk Modified: head/contrib/binutils/Makefile.in ============================================================================== --- head/contrib/binutils/Makefile.in Thu Dec 6 01:25:21 2012 (r243932) +++ head/contrib/binutils/Makefile.in Thu Dec 6 01:31:25 2012 (r243933) @@ -284,7 +284,7 @@ MAKEINFOFLAGS = --split-size=5000000 AS = @AS@ AR = @AR@ -AR_FLAGS = rc +ARFLAGS = @ARFLAGS@ CC = @CC@ CXX = @CXX@ DLLTOOL = @DLLTOOL@ @@ -474,7 +474,7 @@ BASE_FLAGS_TO_PASS = \ "SHELL=$(SHELL)" \ "YACC=$(YACC)" \ "`echo 'ADAFLAGS=$(ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ - "AR_FLAGS=$(AR_FLAGS)" \ + "AR_FLAGS=$(ARFLAGS)" \ "`echo 'BOOT_ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ "BOOT_CFLAGS=$(BOOT_CFLAGS)" \ "BOOT_LDFLAGS=$(BOOT_LDFLAGS)" \ Modified: head/contrib/binutils/Makefile.tpl ============================================================================== --- head/contrib/binutils/Makefile.tpl Thu Dec 6 01:25:21 2012 (r243932) +++ head/contrib/binutils/Makefile.tpl Thu Dec 6 01:31:25 2012 (r243933) @@ -287,7 +287,7 @@ MAKEINFOFLAGS = --split-size=5000000 AS = @AS@ AR = @AR@ -AR_FLAGS = rc +ARFLAGS = @ARFLAGS@ CC = @CC@ CXX = @CXX@ DLLTOOL = @DLLTOOL@ Modified: head/contrib/binutils/libiberty/Makefile.in ============================================================================== --- head/contrib/binutils/libiberty/Makefile.in Thu Dec 6 01:25:21 2012 (r243932) +++ head/contrib/binutils/libiberty/Makefile.in Thu Dec 6 01:31:25 2012 (r243933) @@ -56,7 +56,7 @@ mkinstalldirs = $(SHELL) $(libiberty_top OUTPUT_OPTION = @OUTPUT_OPTION@ AR = @AR@ -AR_FLAGS = rc +ARFLAGS = @ARFLAGS@ CC = @CC@ CFLAGS = @CFLAGS@ @@ -81,7 +81,7 @@ EXTRA_OFILES = # Flags to pass to a recursive make. FLAGS_TO_PASS = \ "AR=$(AR)" \ - "AR_FLAGS=$(AR_FLAGS)" \ + "AR_FLAGS=$(ARFLAGS)" \ "CC=$(CC)" \ "CFLAGS=$(CFLAGS)" \ "DESTDIR=$(DESTDIR)" \ @@ -224,12 +224,12 @@ INSTALLED_HEADERS = $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) -rm -f $(TARGETLIB) pic/$(TARGETLIB) - $(AR) $(AR_FLAGS) $(TARGETLIB) \ + $(AR) $(ARFLAGS) $(TARGETLIB) \ $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) $(RANLIB) $(TARGETLIB) if [ x"$(PICFLAG)" != x ]; then \ cd pic; \ - $(AR) $(AR_FLAGS) $(TARGETLIB) \ + $(AR) $(ARFLAGS) $(TARGETLIB) \ $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \ $(RANLIB) $(TARGETLIB); \ cd ..; \ @@ -237,7 +237,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA $(TESTLIB): $(REQUIRED_OFILES) $(CONFIGURED_OFILES) -rm -f $(TESTLIB) - $(AR) $(AR_FLAGS) $(TESTLIB) \ + $(AR) $(ARFLAGS) $(TESTLIB) \ $(REQUIRED_OFILES) $(CONFIGURED_OFILES) $(RANLIB) $(TESTLIB) Modified: head/contrib/cvs/diff/Makefile.in ============================================================================== --- head/contrib/cvs/diff/Makefile.in Thu Dec 6 01:25:21 2012 (r243932) +++ head/contrib/cvs/diff/Makefile.in Thu Dec 6 01:31:25 2012 (r243933) @@ -41,8 +41,8 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LIBRARIES = $(noinst_LIBRARIES) -AR = ar -ARFLAGS = cru +AR = @AR@ +ARFLAGS = @ARFLAGS@ libdiff_a_AR = $(AR) $(ARFLAGS) libdiff_a_LIBADD = am_libdiff_a_OBJECTS = diff.$(OBJEXT) diff3.$(OBJEXT) \ Modified: head/contrib/cvs/lib/Makefile.in ============================================================================== --- head/contrib/cvs/lib/Makefile.in Thu Dec 6 01:25:21 2012 (r243932) +++ head/contrib/cvs/lib/Makefile.in Thu Dec 6 01:31:25 2012 (r243933) @@ -63,8 +63,8 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = fnmatch.h LIBRARIES = $(noinst_LIBRARIES) -AR = ar -ARFLAGS = cru +AR = @AR@ +ARFLAGS = @ARFLAGS@ libcvs_a_AR = $(AR) $(ARFLAGS) libcvs_a_DEPENDENCIES = @LIBOBJS@ am_libcvs_a_OBJECTS = argmatch.$(OBJEXT) getdate.$(OBJEXT) \ Modified: head/contrib/dtc/Makefile ============================================================================== --- head/contrib/dtc/Makefile Thu Dec 6 01:25:21 2012 (r243932) +++ head/contrib/dtc/Makefile Thu Dec 6 01:31:25 2012 (r243933) @@ -48,7 +48,7 @@ ifdef V VECHO = : else VECHO = echo " " -ARFLAGS = rc +ARFLAGS ?= rc .SILENT: endif Modified: head/contrib/gcc/Makefile.in ============================================================================== --- head/contrib/gcc/Makefile.in Thu Dec 6 01:25:21 2012 (r243932) +++ head/contrib/gcc/Makefile.in Thu Dec 6 01:31:25 2012 (r243933) @@ -238,7 +238,7 @@ BISONFLAGS = FLEX = @FLEX@ FLEXFLAGS = AR = @AR@ -AR_FLAGS = rc +ARFLAGS = @ARFLAGS@ NM = @NM@ RANLIB = @RANLIB@ RANLIB_FLAGS = @ranlib_flags@ @@ -1303,7 +1303,7 @@ compilations: $(BACKEND) # This archive is strictly for the host. libbackend.a: $(OBJS@onestep@) -rm -rf libbackend.a - $(AR) $(AR_FLAGS) libbackend.a $(OBJS@onestep@) + $(AR) $(ARFLAGS) libbackend.a $(OBJS@onestep@) -$(RANLIB) $(RANLIB_FLAGS) libbackend.a # We call this executable `xgcc' rather than `gcc' Modified: head/contrib/gcclibs/libcpp/Makefile.in ============================================================================== --- head/contrib/gcclibs/libcpp/Makefile.in Thu Dec 6 01:25:21 2012 (r243932) +++ head/contrib/gcclibs/libcpp/Makefile.in Thu Dec 6 01:31:25 2012 (r243933) @@ -26,8 +26,8 @@ srcdir = @srcdir@ top_builddir = . VPATH = @srcdir@ INSTALL = @INSTALL@ -AR = ar -ARFLAGS = cru +AR = @AR@ +ARFLAGS = @ARFLAGS@ ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ Modified: head/contrib/gcclibs/libdecnumber/Makefile.in ============================================================================== --- head/contrib/gcclibs/libdecnumber/Makefile.in Thu Dec 6 01:25:21 2012 (r243932) +++ head/contrib/gcclibs/libdecnumber/Makefile.in Thu Dec 6 01:31:25 2012 (r243933) @@ -26,8 +26,8 @@ srcdir = @srcdir@ top_builddir = . VPATH = @srcdir@ INSTALL = @INSTALL@ -AR = ar -ARFLAGS = cru +AR = @AR@ +ARFLAGS = @ARFLAGS@ ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ Modified: head/contrib/gcclibs/libiberty/Makefile.in ============================================================================== --- head/contrib/gcclibs/libiberty/Makefile.in Thu Dec 6 01:25:21 2012 (r243932) +++ head/contrib/gcclibs/libiberty/Makefile.in Thu Dec 6 01:31:25 2012 (r243933) @@ -56,7 +56,7 @@ mkinstalldirs = $(SHELL) $(libiberty_top OUTPUT_OPTION = @OUTPUT_OPTION@ AR = @AR@ -AR_FLAGS = rc +ARFLAGS = @ARFLAGS@ CC = @CC@ CFLAGS = @CFLAGS@ @@ -81,7 +81,7 @@ EXTRA_OFILES = # Flags to pass to a recursive make. FLAGS_TO_PASS = \ "AR=$(AR)" \ - "AR_FLAGS=$(AR_FLAGS)" \ + "AR_FLAGS=$(ARFLAGS)" \ "CC=$(CC)" \ "CFLAGS=$(CFLAGS)" \ "DESTDIR=$(DESTDIR)" \ @@ -224,12 +224,12 @@ INSTALLED_HEADERS = $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) -rm -f $(TARGETLIB) pic/$(TARGETLIB) - $(AR) $(AR_FLAGS) $(TARGETLIB) \ + $(AR) $(ARFLAGS) $(TARGETLIB) \ $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) $(RANLIB) $(TARGETLIB) if [ x"$(PICFLAG)" != x ]; then \ cd pic; \ - $(AR) $(AR_FLAGS) $(TARGETLIB) \ + $(AR) $(ARFLAGS) $(TARGETLIB) \ $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \ $(RANLIB) $(TARGETLIB); \ cd ..; \ @@ -237,7 +237,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA $(TESTLIB): $(REQUIRED_OFILES) $(CONFIGURED_OFILES) -rm -f $(TESTLIB) - $(AR) $(AR_FLAGS) $(TESTLIB) \ + $(AR) $(ARFLAGS) $(TESTLIB) \ $(REQUIRED_OFILES) $(CONFIGURED_OFILES) $(RANLIB) $(TESTLIB) Modified: head/contrib/gdtoa/makefile ============================================================================== --- head/contrib/gdtoa/makefile Thu Dec 6 01:25:21 2012 (r243932) +++ head/contrib/gdtoa/makefile Thu Dec 6 01:31:25 2012 (r243933) @@ -26,6 +26,8 @@ .SUFFIXES: .c .o CC = cc CFLAGS = -g +AR ?= ar +ARFLAGS ?= ruv .c.o: $(CC) -c $(CFLAGS) $*.c @@ -52,12 +54,12 @@ gdtoa.a: dmisc.c dtoa.c g_Qfmt.c g__fmt strtopx.c strtopxL.c strtorQ.c strtord.c strtordd.c strtorf.c\ strtorx.c strtorxL.c sum.c ulp.c $(CC) -c $(CFLAGS) $? - x=`echo $? | sed 's/\.c/.o/g'` && ar ruv gdtoa.a $$x && rm $$x + x=`echo $? | sed 's/\.c/.o/g'` && $(AR) $(ARFLAGS) gdtoa.a $$x && rm $$x ranlib gdtoa.a || true Printf: all printf.c $(CC) -c $(CFLAGS) printf.c - ar ruv gdtoa.a printf.o + $(AR) $(ARFLAGS) gdtoa.a printf.o rm printf.o touch Printf Modified: head/contrib/gperf/lib/Makefile.in ============================================================================== --- head/contrib/gperf/lib/Makefile.in Thu Dec 6 01:25:21 2012 (r243932) +++ head/contrib/gperf/lib/Makefile.in Thu Dec 6 01:31:25 2012 (r243933) @@ -43,8 +43,8 @@ CXXCPP = @CXXCPP@ # Both C and C++ compiler OBJEXT = @OBJEXT@ # Other -AR = ar -AR_FLAGS = rc +AR = @AR@ +ARFLAGS = @ARFLAGS@ RANLIB = @RANLIB@ MV = mv LN = ln @@ -71,7 +71,7 @@ all : $(TARGETLIB) $(TARGETLIB): $(OBJECTS) $(RM) $@ - $(AR) $(AR_FLAGS) $@ $(OBJECTS) + $(AR) $(ARFLAGS) $@ $(OBJECTS) $(RANLIB) $@ # Don't use implicit rules, since AIX "make" and OSF/1 "make" don't always Modified: head/contrib/ntp/arlib/Makefile.in ============================================================================== --- head/contrib/ntp/arlib/Makefile.in Thu Dec 6 01:25:21 2012 (r243932) +++ head/contrib/ntp/arlib/Makefile.in Thu Dec 6 01:31:25 2012 (r243933) @@ -50,8 +50,8 @@ mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) -AR = ar -ARFLAGS = cru +AR = @AR@ +ARFLAGS = @ARFLAGS@ libares_a_AR = $(AR) $(ARFLAGS) libares_a_LIBADD = am_libares_a_OBJECTS = arlib.$(OBJEXT) Modified: head/contrib/ntp/libntp/Makefile.in ============================================================================== --- head/contrib/ntp/libntp/Makefile.in Thu Dec 6 01:25:21 2012 (r243932) +++ head/contrib/ntp/libntp/Makefile.in Thu Dec 6 01:31:25 2012 (r243933) @@ -52,7 +52,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru +ARFLAGS = @ARFLAGS@ libntp_a_AR = $(AR) $(ARFLAGS) libntp_a_LIBADD = am__objects_1 = a_md5encrypt$U.$(OBJEXT) adjtime$U.$(OBJEXT) \ Modified: head/contrib/ntp/libparse/Makefile.in ============================================================================== --- head/contrib/ntp/libparse/Makefile.in Thu Dec 6 01:25:21 2012 (r243932) +++ head/contrib/ntp/libparse/Makefile.in Thu Dec 6 01:31:25 2012 (r243933) @@ -52,7 +52,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru +ARFLAGS ?= cru libparse_a_AR = $(AR) $(ARFLAGS) libparse_a_LIBADD = am_libparse_a_OBJECTS = parse$U.$(OBJEXT) parse_conf$U.$(OBJEXT) \ Modified: head/contrib/ntp/ntpd/Makefile.in ============================================================================== --- head/contrib/ntp/ntpd/Makefile.in Thu Dec 6 01:25:21 2012 (r243932) +++ head/contrib/ntp/ntpd/Makefile.in Thu Dec 6 01:31:25 2012 (r243933) @@ -58,7 +58,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru +ARFLAGS = @ARFLAGS@ libntpd_a_AR = $(AR) $(ARFLAGS) libntpd_a_LIBADD = am_libntpd_a_OBJECTS = ntp_control$U.$(OBJEXT) ntp_crypto$U.$(OBJEXT) \ Modified: head/contrib/opie/libmissing/Makefile.in ============================================================================== --- head/contrib/opie/libmissing/Makefile.in Thu Dec 6 01:25:21 2012 (r243932) +++ head/contrib/opie/libmissing/Makefile.in Thu Dec 6 01:31:25 2012 (r243933) @@ -22,7 +22,7 @@ TARGET=libmissing.a all: $(TARGET) $(TARGET): $(OBJS) - ar cr $(TARGET) $(OBJS) + @AR@ @ARFLAGS@ $(TARGET) $(OBJS) @RANLIB@ $(TARGET) clean: Modified: head/contrib/opie/libopie/Makefile.in ============================================================================== --- head/contrib/opie/libopie/Makefile.in Thu Dec 6 01:25:21 2012 (r243932) +++ head/contrib/opie/libopie/Makefile.in Thu Dec 6 01:31:25 2012 (r243933) @@ -23,7 +23,7 @@ TARGET=libopie.a all: $(TARGET) $(TARGET): $(OBJS) - ar cr $(TARGET) $(OBJS) + @AR@ @ARFLAGS@ $(TARGET) $(OBJS) @RANLIB@ $(TARGET) clean: Modified: head/contrib/tcp_wrappers/Makefile ============================================================================== --- head/contrib/tcp_wrappers/Makefile Thu Dec 6 01:25:21 2012 (r243932) +++ head/contrib/tcp_wrappers/Makefile Thu Dec 6 01:31:25 2012 (r243933) @@ -139,7 +139,7 @@ epix: freebsd: @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ - RANLIB=ranlib ARFLAGS=rv AUX_OBJ= NETGROUP=-DNETGROUP TLI= \ + RANLIB=ranlib ARFLAGS=$(ARFLAGS) AUX_OBJ= NETGROUP=-DNETGROUP TLI= \ EXTRA_CFLAGS="-DSYS_ERRLIST_DEFINED -DINET6 -DUSE_GETIPNODEBY" \ VSYSLOG= all @@ -401,7 +401,7 @@ machten: RANLIB = ranlib # have ranlib (BSD-ish UNIX) #RANLIB = echo # no ranlib (SYSV-ish UNIX) -ARFLAGS = rv # most systems +ARFLAGS ?= rv # most systems #ARFLAGS= rvs # IRIX 4.0.x AR = ar Modified: head/contrib/tcpdump/Makefile.in ============================================================================== --- head/contrib/tcpdump/Makefile.in Thu Dec 6 01:25:21 2012 (r243932) +++ head/contrib/tcpdump/Makefile.in Thu Dec 6 01:31:25 2012 (r243933) @@ -366,7 +366,7 @@ $(PROG): $(OBJ) @V_PCAPDEP@ $(LIBNETDISSECT): $(LIBNETDISSECT_OBJ) @rm -f $@ - $(AR) cr $@ $(LIBNETDISSECT_OBJ) + $(AR) $(ARFLAGS) $@ $(LIBNETDISSECT_OBJ) $(RANLIB) $@ datalinks.o: $(srcdir)/missing/datalinks.c Modified: head/crypto/heimdal/appl/ftp/common/Makefile.in ============================================================================== --- head/crypto/heimdal/appl/ftp/common/Makefile.in Thu Dec 6 01:25:21 2012 (r243932) +++ head/crypto/heimdal/appl/ftp/common/Makefile.in Thu Dec 6 01:31:25 2012 (r243933) @@ -96,7 +96,7 @@ CONFIG_HEADER = $(top_builddir)/include/ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru +ARFLAGS ?= cru libcommon_a_AR = $(AR) $(ARFLAGS) libcommon_a_LIBADD = am_libcommon_a_OBJECTS = sockbuf.$(OBJEXT) buffer.$(OBJEXT) Modified: head/crypto/heimdal/appl/telnet/libtelnet/Makefile.in ============================================================================== --- head/crypto/heimdal/appl/telnet/libtelnet/Makefile.in Thu Dec 6 01:25:21 2012 (r243932) +++ head/crypto/heimdal/appl/telnet/libtelnet/Makefile.in Thu Dec 6 01:31:25 2012 (r243933) @@ -96,7 +96,7 @@ CONFIG_HEADER = $(top_builddir)/include/ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru +ARFLAGS ?= cru libtelnet_a_AR = $(AR) $(ARFLAGS) libtelnet_a_LIBADD = am_libtelnet_a_OBJECTS = auth.$(OBJEXT) enc_des.$(OBJEXT) \ Modified: head/crypto/openssl/Makefile.org ============================================================================== --- head/crypto/openssl/Makefile.org Thu Dec 6 01:25:21 2012 (r243932) +++ head/crypto/openssl/Makefile.org Thu Dec 6 01:31:25 2012 (r243933) @@ -63,8 +63,8 @@ DEPFLAG= PEX_LIBS= EX_LIBS= EXE_EXT= -ARFLAGS= -AR=ar $(ARFLAGS) r +ARFLAGS?= r +AR=ar $(ARFLAGS) RANLIB= ranlib NM= nm PERL= perl Modified: head/crypto/openssl/crypto/Makefile ============================================================================== --- head/crypto/openssl/crypto/Makefile Thu Dec 6 01:25:21 2012 (r243932) +++ head/crypto/openssl/crypto/Makefile Thu Dec 6 01:31:25 2012 (r243933) @@ -13,7 +13,8 @@ MAKEDEPPROG= makedepend MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) MAKEFILE= Makefile RM= rm -f -AR= ar r +ARFLAGS?= r +AR= ar ${ARFLAGS} RECURSIVE_MAKE= [ -n "$(SDIRS)" ] && for i in $(SDIRS) ; do \ (cd $$i && echo "making $$target in $(DIR)/$$i..." && \ Modified: head/gnu/lib/libgcc/Makefile ============================================================================== --- head/gnu/lib/libgcc/Makefile Thu Dec 6 01:25:21 2012 (r243932) +++ head/gnu/lib/libgcc/Makefile Thu Dec 6 01:31:25 2012 (r243933) @@ -341,7 +341,7 @@ CLEANFILES += libgcc.map libgcc_eh.a: ${EH_OBJS_T} @${ECHO} building static gcc_eh library @rm -f ${.TARGET} - @${AR} cq ${.TARGET} `lorder ${EH_OBJS_T} | tsort -q` + @${AR} ${ARFLAGS} ${.TARGET} `lorder ${EH_OBJS_T} | tsort -q` ${RANLIB} ${.TARGET} all: libgcc_eh.a @@ -350,7 +350,7 @@ all: libgcc_eh.a libgcc_eh_p.a: ${EH_OBJS_P} @${ECHO} building profiled gcc_eh library @rm -f ${.TARGET} - @${AR} cq ${.TARGET} `lorder ${EH_OBJS_P} | tsort -q` + @${AR} ${ARFLAGS} ${.TARGET} `lorder ${EH_OBJS_P} | tsort -q` ${RANLIB} ${.TARGET} all: libgcc_eh_p.a .endif Modified: head/gnu/usr.bin/cc/cc_tools/Makefile ============================================================================== --- head/gnu/usr.bin/cc/cc_tools/Makefile Thu Dec 6 01:25:21 2012 (r243932) +++ head/gnu/usr.bin/cc/cc_tools/Makefile Thu Dec 6 01:31:25 2012 (r243933) @@ -512,7 +512,7 @@ ${_src:R:S/$/.o/}: ${_src} ${LIBIBERTY}: ${LIBIBERTY_OBJS} @rm -f ${.TARGET} - @${AR} cq ${.TARGET} `lorder ${LIBIBERTY_OBJS} | tsort -q` + @${AR} ${ARFLAGS} ${.TARGET} `lorder ${LIBIBERTY_OBJS} | tsort -q` ${RANLIB} ${.TARGET} CLEANFILES+= ${LIBIBERTY} ${LIBIBERTY_OBJS} Modified: head/share/mk/bsd.lib.mk ============================================================================== --- head/share/mk/bsd.lib.mk Thu Dec 6 01:25:21 2012 (r243932) +++ head/share/mk/bsd.lib.mk Thu Dec 6 01:31:25 2012 (r243933) @@ -135,9 +135,9 @@ lib${LIB}.a: ${OBJS} ${STATICOBJS} @${ECHO} building static ${LIB} library @rm -f ${.TARGET} .if !defined(NM) - @${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} + @${AR} ${ARFLAGS} ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} .else - @${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} + @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} .endif ${RANLIB} ${.TARGET} .endif @@ -152,9 +152,9 @@ lib${LIB}_p.a: ${POBJS} @${ECHO} building profiled ${LIB} library @rm -f ${.TARGET} .if !defined(NM) - @${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD} + @${AR} ${ARFLAGS} ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD} .else - @${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD} + @${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD} .endif ${RANLIB} ${.TARGET} .endif @@ -202,7 +202,7 @@ _LIBS+= lib${LIB}_pic.a lib${LIB}_pic.a: ${SOBJS} @${ECHO} building special pic ${LIB} library @rm -f ${.TARGET} - @${AR} cq ${.TARGET} ${SOBJS} ${ARADD} + @${AR} ${ARFLAGS} ${.TARGET} ${SOBJS} ${ARADD} ${RANLIB} ${.TARGET} .endif