[darwinbuild-changes] [856] branches/PR-8279204
source_changes at macosforge.org
source_changes at macosforge.org
Fri Aug 6 09:48:25 PDT 2010
Revision: 856
http://trac.macosforge.org/projects/darwinbuild/changeset/856
Author: wsiegrist at apple.com
Date: 2010-08-06 09:48:24 -0700 (Fri, 06 Aug 2010)
Log Message:
-----------
Remove OpenSSL from build files
Modified Paths:
--------------
branches/PR-8279204/archs.sh
branches/PR-8279204/darwinbuild.xcodeproj/project.pbxproj
branches/PR-8279204/darwinxref/plugins/c_plugins.xcconfig
Removed Paths:
-------------
branches/PR-8279204/darwinbuild/Makefile
branches/PR-8279204/darwinup/Makefile
branches/PR-8279204/darwinxref/Makefile
Modified: branches/PR-8279204/archs.sh
===================================================================
--- branches/PR-8279204/archs.sh 2010-08-06 16:39:37 UTC (rev 855)
+++ branches/PR-8279204/archs.sh 2010-08-06 16:48:24 UTC (rev 856)
@@ -4,7 +4,6 @@
# Detect which arches we should build for
#
-CRYPTO_ARCHS=`lipo -info /usr/lib/libcrypto.dylib | cut -d : -f 3`
SQLITE_ARCHS=`lipo -info /usr/lib/libsqlite3.dylib | cut -d : -f 3`
TCL_ARCHS=`lipo -info /usr/lib/libtcl.dylib | cut -d : -f 3`
SYSTEM_ARCHS=`lipo -info /usr/lib/libSystem.dylib | cut -d : -f 3`
@@ -15,7 +14,7 @@
for ARCH in $SYSTEM_ARCHS;
do
# crosscheck against the remaining sets...
- for ALIST in "$CRYPTO_ARCHS" "$SQLITE_ARCHS" "$TCL_ARCHS";
+ for ALIST in "$SQLITE_ARCHS" "$TCL_ARCHS";
do
# see if ARCH is not in ALIST
if [[ ${ALIST/$ARCH} == $ALIST ]];
Deleted: branches/PR-8279204/darwinbuild/Makefile
===================================================================
--- branches/PR-8279204/darwinbuild/Makefile 2010-08-06 16:39:37 UTC (rev 855)
+++ branches/PR-8279204/darwinbuild/Makefile 2010-08-06 16:48:24 UTC (rev 856)
@@ -1,75 +0,0 @@
-include ../common.mk
-
-###
-### Variables for the 'install' phase
-###
-DATDIR:=$(DATDIR)/darwinbuild
-
-PrefixReplacements = darwinbuild \
- darwinmaster.sh \
- packageRoots.sh \
- thinPackages.sh \
- installXcode \
- installXcode32
-
-all: manifest prefixes
-
-manifest: manifest.c
- cc $(CFLAGS) -Wall -Werror -o $(OBJROOT)/$@ -lcrypto $^
-
-prefixes: $(PrefixReplacements)
-
-$(PrefixReplacements): % : %.in
- $(SED) -e 's,%%PREFIX%%,$(PREFIX),' $@.in > $@ ;
-
-install: all
- [ -d $(BINDIR) ] || $(INSTALL) -d $(INSTALL_DIR_FLAGS) $(BINDIR)
- $(INSTALL) $(INSTALL_EXE_FLAGS) darwinbuild $(BINDIR)
- $(INSTALL) $(INSTALL_EXE_FLAGS) darwinmaster $(BINDIR)
-
- [ -d $(DATDIR) ] || $(INSTALL) -d $(INSTALL_DIR_FLAGS) $(DATDIR)
- $(INSTALL) $(INSTALL_DOC_FLAGS) darwinbuild.common $(DATDIR)
- $(INSTALL) $(INSTALL_EXE_FLAGS) installXcode $(DATDIR)
- $(INSTALL) $(INSTALL_EXE_FLAGS) installXcode2 $(DATDIR)
- $(INSTALL) $(INSTALL_EXE_FLAGS) installXcode3 $(DATDIR)
- $(INSTALL) $(INSTALL_EXE_FLAGS) installXcode31 $(DATDIR)
- $(INSTALL) $(INSTALL_EXE_FLAGS) installXcode32 $(DATDIR)
- $(INSTALL) $(INSTALL_DOC_FLAGS) Info.plist $(DATDIR)
- $(INSTALL) $(INSTALL_DOC_FLAGS) SDKSettings.plist $(DATDIR)
-
- $(INSTALL) $(INSTALL_EXE_FLAGS) createChroot $(DATDIR)
- $(INSTALL) $(INSTALL_EXE_FLAGS) $(OBJROOT)/manifest $(DATDIR)
- $(INSTALL) $(INSTALL_EXE_FLAGS) ditto $(DATDIR)
- $(INSTALL) $(INSTALL_EXE_FLAGS) buildlist $(DATDIR)
- $(INSTALL) $(INSTALL_EXE_FLAGS) buildorder $(DATDIR)
- $(INSTALL) $(INSTALL_EXE_FLAGS) packageRoots $(DATDIR)
- $(INSTALL) $(INSTALL_EXE_FLAGS) synthfat $(DATDIR)
- $(INSTALL) $(INSTALL_EXE_FLAGS) thinFile $(DATDIR)
- $(INSTALL) $(INSTALL_EXE_FLAGS) thinPackages $(DATDIR)
-
-uninstall:
- rm -f $(BINDIR)/darwinbuild
- rm -f $(BINDIR)/darwinmaster
- rm -f $(DATDIR)/darwinbuild.common
- rm -f $(DATDIR)/installXcode
- rm -f $(DATDIR)/installXcode2
- rm -f $(DATDIR)/installXcode3
- rm -f $(DATDIR)/installXcode31
- rm -f $(DATDIR)/installXcode32
- rm -f $(DATDIR)/Info.plist
- rm -f $(DATDIR)/SDKSettings.plist
- rm -f $(DATDIR)/createChroot
- rm -f $(DATDIR)/manifest
- rm -f $(DATDIR)/ditto
- rm -f $(DATDIR)/buildlist
- rm -f $(DATDIR)/buildorder
- rm -f $(DATDIR)/packageRoots
- rm -f $(DATDIR)/synthfat
- rm -f $(DATDIR)/thinFile
- rm -f $(DATDIR)/thinPackages
-
-
-clean:
- rm -f manifest
- @$(foreach SCRIPT,$(PrefixReplacements), \
- rm -f $(SCRIPT) ; )
Modified: branches/PR-8279204/darwinbuild.xcodeproj/project.pbxproj
===================================================================
--- branches/PR-8279204/darwinbuild.xcodeproj/project.pbxproj 2010-08-06 16:39:37 UTC (rev 855)
+++ branches/PR-8279204/darwinbuild.xcodeproj/project.pbxproj 2010-08-06 16:48:24 UTC (rev 856)
@@ -161,7 +161,6 @@
72C86C9D109745BC00C66E90 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72C86BE210965E4F00C66E90 /* main.cpp */; };
72C86C9E109745BC00C66E90 /* SerialSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72C86BE410965E4F00C66E90 /* SerialSet.cpp */; };
72C86C9F109745BC00C66E90 /* Utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72C86BE610965E4F00C66E90 /* Utils.cpp */; };
- 72C86CE210974CC800C66E90 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 72C86CE110974CC700C66E90 /* libcrypto.dylib */; };
72C86CE410974CC800C66E90 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 72C86CE310974CC800C66E90 /* libsqlite3.dylib */; };
72D05CB811D2680500B33EDD /* query.c in Sources */ = {isa = PBXBuildFile; fileRef = 72D05CA911D2678F00B33EDD /* query.c */; };
DF12E2821119E2B0007587C1 /* DB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF12E2811119E2B0007587C1 /* DB.cpp */; };
@@ -770,7 +769,6 @@
72C86C481096609500C66E90 /* darwinup */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = darwinup; sourceTree = BUILT_PRODUCTS_DIR; };
72C86C52109660CA00C66E90 /* darwintrace.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = darwintrace.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
72C86CDD10974C3A00C66E90 /* libredo_prebinding.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libredo_prebinding.a; path = /usr/local/lib/libredo_prebinding.a; sourceTree = "<absolute>"; };
- 72C86CE110974CC700C66E90 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = /usr/lib/libcrypto.dylib; sourceTree = "<absolute>"; };
72C86CE310974CC800C66E90 /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = /usr/lib/libsqlite3.dylib; sourceTree = "<absolute>"; };
72D05CA911D2678F00B33EDD /* query.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = query.c; sourceTree = "<group>"; };
72D05CB711D267C400B33EDD /* query.so */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.objfile"; includeInIndex = 0; path = query.so; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -968,7 +966,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 72C86CE210974CC800C66E90 /* libcrypto.dylib in Frameworks */,
72C86CE410974CC800C66E90 /* libsqlite3.dylib in Frameworks */,
7227ACA01098FCAA00BE33D7 /* libredo_prebinding.a in Frameworks */,
);
@@ -1000,7 +997,6 @@
72C86BD510965DC900C66E90 /* darwinbuild */,
72C86C391096607900C66E90 /* Products */,
72C86CDD10974C3A00C66E90 /* libredo_prebinding.a */,
- 72C86CE110974CC700C66E90 /* libcrypto.dylib */,
72C86CE310974CC800C66E90 /* libsqlite3.dylib */,
72574A0F10977F7A00B13BC3 /* CoreFoundation.framework */,
72574A1410977FAD00B13BC3 /* libtcl.dylib */,
Deleted: branches/PR-8279204/darwinup/Makefile
===================================================================
--- branches/PR-8279204/darwinup/Makefile 2010-08-06 16:39:37 UTC (rev 855)
+++ branches/PR-8279204/darwinup/Makefile 2010-08-06 16:48:24 UTC (rev 856)
@@ -1,30 +0,0 @@
-include ../common.mk
-
-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 \
- echo libredo.o ; fi)
-
-all: darwinup
-
-darwinup: Archive.o Depot.o Digest.o File.o SerialSet.o Utils.o main.o \
- $(REDO)
- 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
-Digest.o: Digest.cpp Digest.h
-File.o: File.cpp Archive.h Digest.h File.h Utils.h
-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
Deleted: branches/PR-8279204/darwinxref/Makefile
===================================================================
--- branches/PR-8279204/darwinxref/Makefile 2010-08-06 16:39:37 UTC (rev 855)
+++ branches/PR-8279204/darwinxref/Makefile 2010-08-06 16:48:24 UTC (rev 856)
@@ -1,108 +0,0 @@
-include ../common.mk
-
-###
-### Variables for the 'install' phase
-###
-DATDIR:=$(DATDIR)/darwinxref
-INCDIR:=$(INCDIR)/darwinbuild
-
-SOURCES= \
- DBDataStore.c \
- DBPlugin.c \
- DBTclPlugin.c \
- cfutils.c \
- main.c
-
-PLUGIN_SOURCES=$(wildcard plugins/*.c)
-PLUGIN_OBJECTS=$(PLUGIN_SOURCES:.c=.so) $(wildcard plugins/*.tcl)
-
-### todo: --with-plugin-path configuration
-CFLAGS+= \
- -DDEFAULT_DB_FILE=\".build/xref.db\" \
- -DDEFAULT_PLUGIN_PATH=\"$(subst $(DESTDIR),,$(DATDIR))/plugins\" \
-
-### todo: --with-tcl-plugins configuration
-TCL_CFLAGS=-DHAVE_TCL_PLUGINS=1
-TCL_LDFLAGS=-ltcl
-
-CFLAGS+=-g -Wall -Werror $(TCL_CFLAGS) $(SQLITEINC)
-LDFLAGS+=-framework CoreFoundation $(TCL_LDFLAGS)
-PLUGIN_CFLAGS=$(CFLAGS) -I.
-PLUGIN_LDFLAGS=$(LDFLAGS) -bundle -bundle_loader $(SYMROOT)/darwinxref
-
-CC = cc
-DSYMUTIL = dsymutil
-
-all: \
- darwinxref \
- $(PLUGIN_SOURCES:.c=.so) \
- upgrade_plist \
- apple_plugins
-
-install: all install_apple_plugins
- [ -d $(BINDIR) ] || \
- $(INSTALL) -d $(INSTALL_DIR_FLAGS) $(BINDIR)
- $(INSTALL) $(INSTALL_EXE_FLAGS) $(SYMROOT)/darwinxref $(BINDIR)
-
- [ -d $(DATDIR)/plugins ] || \
- $(INSTALL) -d $(INSTALL_DIR_FLAGS) $(DATDIR)/plugins
- $(INSTALL) $(INSTALL_DOC_FLAGS) $(OBJROOT)/plugins/*.so plugins/*.tcl $(DATDIR)/plugins
-
- [ -d $(INCDIR) ] || \
- $(INSTALL) -d $(INSTALL_DIR_FLAGS) $(INCDIR)
- $(INSTALL) $(INSTALL_DOC_FLAGS) DBPlugin.h cfutils.h $(INCDIR)
-
-uninstall:
- rm -f $(BINDIR)/darwinxref
- [ ! -d $(DATDIR) ] || ( cd $(DATDIR) && rm -f $(PLUGIN_OBJECTS) )
- -rmdir $(DATDIR)/plugins
- -rmdir $(DATDIR)
-
- rm -f $(INCDIR)/DBPlugin.h
- rm -f $(INCDIR)/cfutils.h
- -rmdir $(INCDIR)
-
-clean:
- rm -f darwinxref
- rm -rf darwinxref.dSYM
- rm -f $(SOURCES:.c=.o)
- rm -f $(PLUGIN_SOURCES:.c=.so)
- rm -rf $(PLUGIN_SOURCES:.c=.so.dSYM)
- rm -f upgrade_plist
- rm -rf upgrade_plist.dSYM
-
-darwinxref: $(SOURCES)
- @for CFILE in $(SOURCES); do \
- OFILE=$$(echo $$(basename $${CFILE}) | sed -e 's,\.[^.]*$$,.o,') ; \
- CMD="$(CC) $(CFLAGS) -c -o $(OBJROOT)/$${OFILE} $${CFILE}"; \
- echo $$CMD ; $$CMD || exit 1 ; \
- done
- $(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 darwinxref
- @mkdir -p $(OBJROOT)/plugins
- cc $(CFLAGS) -o $(OBJROOT)/$@ $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) $(SQLITEINC) $(SQLITELIB) -lcrypto $<
-
-plugins/%.so: plugins/%.c DBPlugin.h darwinxref
- @mkdir -p $(OBJROOT)/plugins
- cc $(CFLAGS) -o $(OBJROOT)/$@ $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) $<
-
-plugins-darwinports/%.so: plugins-darwinports/%.c DBPlugin.h darwinxref
- cc $(CFLAGS) -o $(OBJROOT)/$@ $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) $<
-
-apple_plugins:
- @if [ -d plugins-apple ]; then \
- make -C plugins-apple; \
- fi
-
-install_apple_plugins:
- @if [ -d plugins-apple ]; then \
- make -C plugins-apple install; \
- fi
-
-upgrade_plist: upgrade_plist.c cfutils.c
- cc $(CFLAGS) -o $(OBJROOT)/$@ $(CFLAGS) $(LDFLAGS) $^
-
Modified: branches/PR-8279204/darwinxref/plugins/c_plugins.xcconfig
===================================================================
--- branches/PR-8279204/darwinxref/plugins/c_plugins.xcconfig 2010-08-06 16:39:37 UTC (rev 855)
+++ branches/PR-8279204/darwinxref/plugins/c_plugins.xcconfig 2010-08-06 16:48:24 UTC (rev 856)
@@ -41,7 +41,7 @@
GCC_WARN_UNUSED_VALUE = YES
GCC_WARN_UNUSED_VARIABLE = YES
OTHER_CFLAGS =
-OTHER_LDFLAGS = -framework CoreFoundation -ltcl -lcrypto -lsqlite3
+OTHER_LDFLAGS = -framework CoreFoundation -ltcl -lsqlite3
PRODUCT_NAME = $(TARGET_NAME)
WARNING_CFLAGS = -Werror -Wall
PREFIX = /usr/local
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/darwinbuild-changes/attachments/20100806/f49c9629/attachment-0001.html>
More information about the darwinbuild-changes
mailing list