January 2009 - darwinbuild-changes - lists.macosforge.org

[460] branches/PR-6493844/
by source_changes＠macosforge.org 13 Jan '09

13 Jan '09

Revision: 460 http://trac.macosforge.org/projects/darwinbuild/changeset/460 Author: wsiegrist(a)apple.com Date: 2009-01-13 15:59:11 -0800 (Tue, 13 Jan 2009) Log Message: ----------- Branching for rdar://6493844 Added Paths: ----------- branches/PR-6493844/ Property changes on: branches/PR-6493844 ___________________________________________________________________ Added: svn:mergeinfo + /branches/PR-4841388:399-419 /branches/PR-6358021:442-443 /branches/PR-6392966:423-427 /branches/PR-6398060:433-434 /trunk:432-434

1 0

[459] trunk/plists/9G55.plist
by source_changes＠macosforge.org 13 Jan '09

13 Jan '09

Revision: 459 http://trac.macosforge.org/projects/darwinbuild/changeset/459 Author: wsiegrist(a)apple.com Date: 2009-01-13 13:04:09 -0800 (Tue, 13 Jan 2009) Log Message: ----------- New CarbonHeaders project to add Availability.h Modified Paths: -------------- trunk/plists/9G55.plist Modified: trunk/plists/9G55.plist =================================================================== --- trunk/plists/9G55.plist 2009-01-12 16:37:19 UTC (rev 458) +++ trunk/plists/9G55.plist 2009-01-13 21:04:09 UTC (rev 459) @@ -35,6 +35,9 @@ BootCache = { version = 43.10; }; + CarbonHeaders = { + version = 9G55; + }; CF = { version = 476.17; };

1 0

[458] trunk/darwinbuild/installXcode31
by source_changes＠macosforge.org 12 Jan '09

12 Jan '09

Revision: 458 http://trac.macosforge.org/projects/darwinbuild/changeset/458 Author: wsiegrist(a)apple.com Date: 2009-01-12 08:37:19 -0800 (Mon, 12 Jan 2009) Log Message: ----------- Symlink lex and ranlib into XCD. Closes #43 and #51 Modified Paths: -------------- trunk/darwinbuild/installXcode31 Modified: trunk/darwinbuild/installXcode31 =================================================================== --- trunk/darwinbuild/installXcode31 2009-01-11 21:01:41 UTC (rev 457) +++ trunk/darwinbuild/installXcode31 2009-01-12 16:37:19 UTC (rev 458) @@ -27,8 +27,10 @@ g++ \ g++-4.0 \ g++-4.2 \ + lex \ libtool \ mig \ + ranlib \ strip \ yacc)

1 0

[457] trunk/darwinup
by source_changes＠macosforge.org 11 Jan '09

11 Jan '09

Revision: 457 http://trac.macosforge.org/projects/darwinbuild/changeset/457 Author: wsiegrist(a)apple.com Date: 2009-01-11 13:01:41 -0800 (Sun, 11 Jan 2009) Log Message: ----------- Build fixes for darwinup: * make libredo.o 4-way fat * put the all make target first so install is not the default Modified Paths: -------------- trunk/darwinup/Makefile trunk/darwinup/libredo.o Modified: trunk/darwinup/Makefile =================================================================== --- trunk/darwinup/Makefile 2009-01-08 22:30:33 UTC (rev 456) +++ trunk/darwinup/Makefile 2009-01-11 21:01:41 UTC (rev 457) @@ -6,14 +6,6 @@ echo /usr/local/lib/libredo_prebinding.a ; else \ echo libredo.o ; fi) - -install: all - [ -d $(BINDIR) ] || $(INSTALL) -d $(INSTALL_DIR_FLAGS) $(BINDIR) - $(INSTALL) $(INSTALL_EXE_FLAGS) darwinup $(BINDIR) - -uninstall: - rm -f $(BINDIR)/darwinup - all: darwinup darwinup: Archive.o Depot.o Digest.o File.o SerialSet.o Utils.o main.o \ @@ -27,5 +19,12 @@ Utils.o: Utils.h main.o: main.cpp Depot.h Utils.h +install: all + [ -d $(BINDIR) ] || $(INSTALL) -d $(INSTALL_DIR_FLAGS) $(BINDIR) + $(INSTALL) $(INSTALL_EXE_FLAGS) darwinup $(BINDIR) + +uninstall: + rm -f $(BINDIR)/darwinup + clean: rm -f darwinup Archive.o Depot.o Digest.o File.o SerialSet.o Utils.o main.o Modified: trunk/darwinup/libredo.o =================================================================== (Binary files differ)

1 0

[456] tags/darwinbuild-5/
by source_changes＠macosforge.org 08 Jan '09

08 Jan '09

Revision: 456 http://trac.macosforge.org/projects/darwinbuild/changeset/456 Author: wsiegrist(a)apple.com Date: 2009-01-08 14:30:33 -0800 (Thu, 08 Jan 2009) Log Message: ----------- "Tagging darwinbuild-5 from http://svn.macosforge.org/repository/darwinbuild/trunk" Added Paths: ----------- tags/darwinbuild-5/ Property changes on: tags/darwinbuild-5 ___________________________________________________________________ Added: svn:mergeinfo + /branches/PR-4841388:399-419 /branches/PR-6358021:442-443 /branches/PR-6392966:423-427 /branches/PR-6398060:433-434 /trunk:432-434

1 0

propchange - r454 svn:log
by source_changes＠macosforge.org 08 Jan '09

08 Jan '09

Author: wsiegrist(a)apple.com Revision: 454 Property Name: svn:log --- /Volumes/data/admin/var/tmp/revprops/pre-454-wsiegrist(a)apple.com 2009-01-07 19:34:09.000000000 -0800 +++ /Volumes/data/admin/var/tmp/revprops/post-454-wsiegrist(a)apple.com 2009-01-07 19:34:11.000000000 -0800 @@ -1 +1 @@ -Moving tag \ No newline at end of file +Removing invalid tag

1 0

[455] trunk
by source_changes＠macosforge.org 08 Jan '09

08 Jan '09

Revision: 455 http://trac.macosforge.org/projects/darwinbuild/changeset/455 Author: wsiegrist(a)apple.com Date: 2009-01-07 19:28:33 -0800 (Wed, 07 Jan 2009) Log Message: ----------- Use RC_CFLAGS instead of RC_ARCHS Modified Paths: -------------- trunk/common.mk trunk/darwinbuild/Makefile trunk/darwintrace/Makefile trunk/darwinup/Makefile trunk/darwinxref/Makefile Modified: trunk/common.mk =================================================================== --- trunk/common.mk 2009-01-08 03:23:31 UTC (rev 454) +++ trunk/common.mk 2009-01-08 03:28:33 UTC (rev 455) @@ -20,5 +20,6 @@ SED=/usr/bin/sed -RC_ARCHS?=$(shell lipo -info /usr/lib/libSystem.dylib | cut -d : -f 3 | sed 's/ppc7400/ppc/' | awk '{ ORS=" "; for(i=1;i<=NF;i++) print "-arch", $$i}') +RC_CFLAGS?=$(shell lipo -info /usr/lib/libSystem.dylib | cut -d : -f 3 | sed 's/ppc7400/ppc/' | awk '{ ORS=" "; for(i=1;i<=NF;i++) print "-arch", $$i}') +CFLAGS+=$(RC_CFLAGS) Modified: trunk/darwinbuild/Makefile =================================================================== --- trunk/darwinbuild/Makefile 2009-01-08 03:23:31 UTC (rev 454) +++ trunk/darwinbuild/Makefile 2009-01-08 03:28:33 UTC (rev 455) @@ -14,7 +14,7 @@ all: manifest prefixes manifest: manifest.c - cc $(RC_ARCHS) -Wall -Werror -o $(OBJROOT)/$@ -lcrypto $^ + cc $(CFLAGS) -Wall -Werror -o $(OBJROOT)/$@ -lcrypto $^ prefixes: @$(foreach SCRIPT,$(PrefixReplacements), \ Modified: trunk/darwintrace/Makefile =================================================================== --- trunk/darwintrace/Makefile 2009-01-08 03:23:31 UTC (rev 454) +++ trunk/darwintrace/Makefile 2009-01-08 03:28:33 UTC (rev 455) @@ -11,15 +11,15 @@ VERSION=$(shell uname -r | cut -f1 -d. ) ifeq ($(VERSION), 8) -CFLAGS = -nostdlib +CFLAGS += -nostdlib else -CFLAGS = -nodefaultlibs +CFLAGS += -nodefaultlibs endif darwintrace.dylib: darwintrace.c cc -o $(OBJROOT)/$@ \ - $(RC_ARCHS) \ - -g -Wall -Werror -pedantic -std=c99 \ + $(CFLAGS) \ + -Wall -Werror -pedantic -std=c99 \ -flat_namespace \ -fno-common \ $(CFLAGS) \ Modified: trunk/darwinup/Makefile =================================================================== --- trunk/darwinup/Makefile 2009-01-08 03:23:31 UTC (rev 454) +++ trunk/darwinup/Makefile 2009-01-08 03:28:33 UTC (rev 455) @@ -1,6 +1,6 @@ include ../common.mk -CXXFLAGS=-g -Wall -Werror -Wno-non-virtual-dtor $(RC_ARCHS) +CXXFLAGS=-g -Wall -Werror -Wno-non-virtual-dtor $(CFLAGS) # libredo.o is generated from cctools_ofiles REDO=$(shell if [ -f /usr/local/lib/libredo_prebinding.a ]; then \ echo /usr/local/lib/libredo_prebinding.a ; else \ @@ -18,7 +18,7 @@ darwinup: Archive.o Depot.o Digest.o File.o SerialSet.o Utils.o main.o \ $(REDO) - g++ $(RC_ARCHS) -lcrypto -lsqlite3 -o $@ $^ + g++ $(CXXFLAGS) -lcrypto -lsqlite3 -o $@ $^ Archive.o: Archive.cpp Archive.h Depot.h File.h Utils.h Depot.o: Depot.cpp Archive.h Depot.h File.h Utils.h Modified: trunk/darwinxref/Makefile =================================================================== --- trunk/darwinxref/Makefile 2009-01-08 03:23:31 UTC (rev 454) +++ trunk/darwinxref/Makefile 2009-01-08 03:28:33 UTC (rev 455) @@ -20,7 +20,6 @@ CFLAGS+= \ -DDEFAULT_DB_FILE=\".build/xref.db\" \ -DDEFAULT_PLUGIN_PATH=\"$(subst $(DESTDIR),,$(DATDIR))/plugins\" \ - $(RC_ARCHS) ### todo: --with-tcl-plugins configuration TCL_CFLAGS=-DHAVE_TCL_PLUGINS=1 @@ -90,21 +89,21 @@ CMD="$(CC) $(CFLAGS) -c -o $(OBJROOT)/$${OFILE} $${CFILE}"; \ echo $$CMD ; $$CMD || exit 1 ; \ done - $(CC) $(LDFLAGS) $(RC_ARCHS) -o $(SYMROOT)/darwinxref \ + $(CC) $(LDFLAGS) $(CFLAGS) -o $(SYMROOT)/darwinxref \ $(SQLITELIB) \ $(foreach OFILE, $(SOURCES:.c=.o), $(OBJROOT)/$(notdir $(OFILE))) $(DSYMUTIL) --out $(SYMROOT)/darwinxref.dSYM $(SYMROOT)/darwinxref || true plugins/register.so: plugins/register.c DBPlugin.h @mkdir -p $(OBJROOT)/plugins - cc $(RC_ARCHS) -o $(OBJROOT)/$@ $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) $(SQLITEINC) $(SQLITELIB) -lcrypto $< + cc $(CFLAGS) -o $(OBJROOT)/$@ $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) $(SQLITEINC) $(SQLITELIB) -lcrypto $< plugins/%.so: plugins/%.c DBPlugin.h @mkdir -p $(OBJROOT)/plugins - cc $(RC_ARCHS) -o $(OBJROOT)/$@ $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) $< + cc $(CFLAGS) -o $(OBJROOT)/$@ $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) $< plugins-darwinports/%.so: plugins-darwinports/%.c DBPlugin.h - cc $(RC_ARCHS) -o $(OBJROOT)/$@ $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) $< + cc $(CFLAGS) -o $(OBJROOT)/$@ $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) $< apple_plugins: @if [ -d plugins-apple ]; then \ @@ -117,5 +116,5 @@ fi upgrade_plist: upgrade_plist.c cfutils.c - cc $(RC_ARCHS) -o $(OBJROOT)/$@ $(CFLAGS) $(LDFLAGS) $^ + cc $(CFLAGS) -o $(OBJROOT)/$@ $(CFLAGS) $(LDFLAGS) $^

1 0

[454] tags/darwinbuild-5/
by source_changes＠macosforge.org 08 Jan '09

08 Jan '09

Revision: 454 http://trac.macosforge.org/projects/darwinbuild/changeset/454 Author: wsiegrist(a)apple.com Date: 2009-01-07 19:23:31 -0800 (Wed, 07 Jan 2009) Log Message: ----------- Moving tag Removed Paths: ------------- tags/darwinbuild-5/

1 0

[453] tags/darwinbuild-5/
by source_changes＠macosforge.org 08 Jan '09

08 Jan '09

Revision: 453 http://trac.macosforge.org/projects/darwinbuild/changeset/453 Author: wsiegrist(a)apple.com Date: 2009-01-07 18:39:15 -0800 (Wed, 07 Jan 2009) Log Message: ----------- "Tagging darwinbuild-5 from http://svn.macosforge.org/repository/darwinbuild/trunk" Added Paths: ----------- tags/darwinbuild-5/ Property changes on: tags/darwinbuild-5 ___________________________________________________________________ Added: svn:mergeinfo + /branches/PR-4841388:399-419 /branches/PR-6358021:442-443 /branches/PR-6392966:423-427 /branches/PR-6398060:433-434 /trunk:432-434

1 0

[452] trunk
by source_changes＠macosforge.org 08 Jan '09

08 Jan '09

Revision: 452 http://trac.macosforge.org/projects/darwinbuild/changeset/452 Author: wsiegrist(a)apple.com Date: 2009-01-07 18:38:52 -0800 (Wed, 07 Jan 2009) Log Message: ----------- Build according to RC_ARCHS when set, otherwise match the archs in libSystem Modified Paths: -------------- trunk/common.mk trunk/darwinbuild/Makefile trunk/darwintrace/Makefile trunk/darwinup/Makefile trunk/darwinxref/Makefile Modified: trunk/common.mk =================================================================== --- trunk/common.mk 2009-01-08 01:17:16 UTC (rev 451) +++ trunk/common.mk 2009-01-08 02:38:52 UTC (rev 452) @@ -18,4 +18,7 @@ INSTALL_DIR_FLAGS=$(INSTALL_EXE_FLAGS) INSTALL_DOC_FLAGS=-m 0644 -o root -g wheel -SED=/usr/bin/sed \ No newline at end of file +SED=/usr/bin/sed + +RC_ARCHS?=$(shell lipo -info /usr/lib/libSystem.dylib | cut -d : -f 3 | sed 's/ppc7400/ppc/' | awk '{ ORS=" "; for(i=1;i<=NF;i++) print "-arch", $$i}') + Modified: trunk/darwinbuild/Makefile =================================================================== --- trunk/darwinbuild/Makefile 2009-01-08 01:17:16 UTC (rev 451) +++ trunk/darwinbuild/Makefile 2009-01-08 02:38:52 UTC (rev 452) @@ -14,7 +14,7 @@ all: manifest prefixes manifest: manifest.c - cc -Wall -Werror -o $(OBJROOT)/$@ -lcrypto $^ + cc $(RC_ARCHS) -Wall -Werror -o $(OBJROOT)/$@ -lcrypto $^ prefixes: @$(foreach SCRIPT,$(PrefixReplacements), \ Modified: trunk/darwintrace/Makefile =================================================================== --- trunk/darwintrace/Makefile 2009-01-08 01:17:16 UTC (rev 451) +++ trunk/darwintrace/Makefile 2009-01-08 02:38:52 UTC (rev 452) @@ -16,11 +16,9 @@ CFLAGS = -nodefaultlibs endif -ARCHS=$(shell lipo -info /usr/lib/libSystem.dylib | cut -d : -f 3 | sed 's/ppc7400/ppc/' | awk '{ ORS=" "; for(i=1;i<=NF;i++) print "-arch", $$i}') - darwintrace.dylib: darwintrace.c cc -o $(OBJROOT)/$@ \ - $(ARCHS) \ + $(RC_ARCHS) \ -g -Wall -Werror -pedantic -std=c99 \ -flat_namespace \ -fno-common \ Modified: trunk/darwinup/Makefile =================================================================== --- trunk/darwinup/Makefile 2009-01-08 01:17:16 UTC (rev 451) +++ trunk/darwinup/Makefile 2009-01-08 02:38:52 UTC (rev 452) @@ -1,6 +1,6 @@ include ../common.mk -CXXFLAGS=-g -Wall -Werror -Wno-non-virtual-dtor +CXXFLAGS=-g -Wall -Werror -Wno-non-virtual-dtor $(RC_ARCHS) # libredo.o is generated from cctools_ofiles REDO=$(shell if [ -f /usr/local/lib/libredo_prebinding.a ]; then \ echo /usr/local/lib/libredo_prebinding.a ; else \ @@ -18,7 +18,7 @@ darwinup: Archive.o Depot.o Digest.o File.o SerialSet.o Utils.o main.o \ $(REDO) - g++ -lcrypto -lsqlite3 -o $@ $^ + g++ $(RC_ARCHS) -lcrypto -lsqlite3 -o $@ $^ Archive.o: Archive.cpp Archive.h Depot.h File.h Utils.h Depot.o: Depot.cpp Archive.h Depot.h File.h Utils.h Modified: trunk/darwinxref/Makefile =================================================================== --- trunk/darwinxref/Makefile 2009-01-08 01:17:16 UTC (rev 451) +++ trunk/darwinxref/Makefile 2009-01-08 02:38:52 UTC (rev 452) @@ -19,7 +19,8 @@ ### todo: --with-plugin-path configuration CFLAGS+= \ -DDEFAULT_DB_FILE=\".build/xref.db\" \ - -DDEFAULT_PLUGIN_PATH=\"$(subst $(DESTDIR),,$(DATDIR))/plugins\" + -DDEFAULT_PLUGIN_PATH=\"$(subst $(DESTDIR),,$(DATDIR))/plugins\" \ + $(RC_ARCHS) ### todo: --with-tcl-plugins configuration TCL_CFLAGS=-DHAVE_TCL_PLUGINS=1 @@ -89,21 +90,21 @@ CMD="$(CC) $(CFLAGS) -c -o $(OBJROOT)/$${OFILE} $${CFILE}"; \ echo $$CMD ; $$CMD || exit 1 ; \ done - $(CC) $(LDFLAGS) -o $(SYMROOT)/darwinxref \ + $(CC) $(LDFLAGS) $(RC_ARCHS) -o $(SYMROOT)/darwinxref \ $(SQLITELIB) \ $(foreach OFILE, $(SOURCES:.c=.o), $(OBJROOT)/$(notdir $(OFILE))) $(DSYMUTIL) --out $(SYMROOT)/darwinxref.dSYM $(SYMROOT)/darwinxref || true plugins/register.so: plugins/register.c DBPlugin.h @mkdir -p $(OBJROOT)/plugins - cc -o $(OBJROOT)/$@ $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) $(SQLITEINC) $(SQLITELIB) -lcrypto $< + cc $(RC_ARCHS) -o $(OBJROOT)/$@ $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) $(SQLITEINC) $(SQLITELIB) -lcrypto $< plugins/%.so: plugins/%.c DBPlugin.h @mkdir -p $(OBJROOT)/plugins - cc -o $(OBJROOT)/$@ $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) $< + cc $(RC_ARCHS) -o $(OBJROOT)/$@ $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) $< plugins-darwinports/%.so: plugins-darwinports/%.c DBPlugin.h - cc -o $(OBJROOT)/$@ $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) $< + cc $(RC_ARCHS) -o $(OBJROOT)/$@ $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) $< apple_plugins: @if [ -d plugins-apple ]; then \ @@ -116,4 +117,5 @@ fi upgrade_plist: upgrade_plist.c cfutils.c - cc -o $(OBJROOT)/$@ $(CFLAGS) $(LDFLAGS) $^ + cc $(RC_ARCHS) -o $(OBJROOT)/$@ $(CFLAGS) $(LDFLAGS) $^ +

1 0