Diff
Modified: trunk/ChangeLog.odcctools (153 => 154)
--- trunk/ChangeLog.odcctools 2009-06-15 03:51:01 UTC (rev 153)
+++ trunk/ChangeLog.odcctools 2009-06-17 04:06:44 UTC (rev 154)
@@ -1,3 +1,10 @@
+2009-06-16 Peter O'Gorman <peter@pogma.com>
+
+ * files/otool/Makefile.in: Fix make warning.
+ * files/misc/Makefile.in, patches/misc/libtool_lipo_transform.diff:
+ Don't use bare 'lipo' to run lipo.
+ * extract.sh: Add new patch.
+
2009-06-14 Shantonu Sen <ssen@opendarwin.org>
* extract.sh: Fix extracting on 10.6
@@ -5,7 +12,7 @@
2009-06-14 Peter O'Gorman <peter@pogma.com>
- * Fix typo - s/z86_64/z86_64/. Thanks to Shantonu.
+ * Fix typo - s/z86_64/x86_64/. Thanks to Shantonu.
* files/configure.ac: Don't define NON_NATIVE, it's unused.
* extract.sh: Explicitly list PATCHFILES.
Modified: trunk/extract.sh (153 => 154)
--- trunk/extract.sh 2009-06-15 03:51:01 UTC (rev 153)
+++ trunk/extract.sh 2009-06-17 04:06:44 UTC (rev 154)
@@ -71,8 +71,8 @@
libstuff/map_64bit_arches.diff libstuff/sys_types.diff \
misc/libtool-ldpath.diff misc/libtool-pb.diff misc/ranlibname.diff \
misc/redo_prebinding.nogetattrlist.diff \
-misc/redo_prebinding.nomalloc.diff otool/nolibmstub.diff \
-otool/noobjc.diff"
+misc/redo_prebinding.nomalloc.diff misc/libtool_lipo_transform.diff \
+otool/nolibmstub.diff otool/noobjc.diff"
ADDEDFILESDIR=${TOPSRCDIR}/files
Modified: trunk/files/misc/Makefile.in (153 => 154)
--- trunk/files/misc/Makefile.in 2009-06-15 03:51:01 UTC (rev 153)
+++ trunk/files/misc/Makefile.in 2009-06-17 04:06:44 UTC (rev 154)
@@ -31,11 +31,13 @@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
transform = @program_transform_name@
LDPROG = $(shell echo ld | sed '$(transform)')
+LIPOPROG = $(shell echo lipo | sed '$(transform)')
MYINCLUDES = -I$(builddir) -I$(srcdir) -I$(top_builddir)/include \
-I$(top_srcdir)/include $(INCPRIVEXT) $(FORHDRS)
MYWARNINGS =
-MYDEFS = -DBINDIR="\"$(bindir)\"" -DLDPROG="\"$(LDPROG)\""
+MYDEFS = -DBINDIR="\"$(bindir)\"" -DLDPROG="\"$(LDPROG)\"" \
+ -DLIPOPROG="\"$(LIPOPROG)\""
MYLDFLAGS = -L$(top_builddir)/libstuff
MYLIBS = -lstuff
Modified: trunk/files/otool/Makefile.in (153 => 154)
--- trunk/files/otool/Makefile.in 2009-06-15 03:51:01 UTC (rev 153)
+++ trunk/files/otool/Makefile.in 2009-06-17 04:06:44 UTC (rev 154)
@@ -49,7 +49,8 @@
sparc_disasm.c arm_disasm.c
ifneq ($(OBJC),)
-CFILES += print_objc.c print_objc2_32bit.c print_objc2_64bit.c
+OBJCFILES = print_objc.c print_objc2_32bit.c print_objc2_64bit.c
+OBJCOBJS = $(OBJCFILES:.c=.o)
endif
OBJS = $(CFILES:.c=.o)
@@ -60,23 +61,16 @@
$(OBJS): %.o: %.c
$(CC) $(MYCOMPILEFLAGS) -c -o $@ $<
+$(OBJCOBJS): %.o: %.c
+ $(CC) $(OBJC) $(MYCOMPILEFLAGS) -c -o $@ $<
-otool: $(OBJS) ofile.o
+otool: $(OBJS) $(OBJCOBJS) ofile.o
$(CC) -o $@ $^ $(MYLINKFLAGS) -lstuff
ofile.o: $(top_srcdir)/libstuff/ofile.c
$(CC) -DOTOOL $(MYCOMPILEFLAGS) -c -o $@ $<
-print_objc2_32bit.o: print_objc2_32bit.c
- $(CC) $(OBJC) $(MYCOMPILEFLAGS) -c -o $@ $<
-
-print_objc2_64bit.o: print_objc2_64bit.c
- $(CC) $(OBJC) $(MYCOMPILEFLAGS) -c -o $@ $<
-
-print_objc.o: print_objc.c
- $(CC) $(OBJC) $(MYCOMPILEFLAGS) -c -o $@ $<
-
install: otool
mkdir -p $(DESTDIR)/$(bindir)
$(INSTALL_PROGRAM) otool \
Added: trunk/patches/misc/libtool_lipo_transform.diff (0 => 154)
--- trunk/patches/misc/libtool_lipo_transform.diff (rev 0)
+++ trunk/patches/misc/libtool_lipo_transform.diff 2009-06-17 04:06:44 UTC (rev 154)
@@ -0,0 +1,11 @@
+--- libtool.c.orig 2009-06-14 11:21:58.000000000 -0500
++++ libtool.c 2009-06-14 11:24:54.000000000 -0500
+@@ -3017,7 +3017,7 @@
+ if(narchs > 1){
+ tellProjectBuilder("Combining into %s", "", cmd_flags.output);
+ reset_execute_list();
+- add_execute_list("lipo");
++ add_execute_list(makestr(BINDIR, "/", LIPOPROG, NULL));
+ add_execute_list("-create");
+ add_execute_list("-output");
+ add_execute_list(cmd_flags.output);