diff options
-rw-r--r-- | data/gdb/_metadata/version | 2 | ||||
-rw-r--r-- | data/gdb/gdb-1119.tar.gz (renamed from data/gdb/gdb-962.tar.gz) | bin | 17876280 -> 17820429 bytes | |||
-rw-r--r-- | data/gdb/make.sh | 3 | ||||
-rw-r--r-- | data/gdb/mig.diff | 35 | ||||
-rw-r--r-- | data/gdb/setpgrp.diff | 12 | ||||
-rw-r--r-- | data/gdb/strip.diff | 26 |
6 files changed, 31 insertions, 47 deletions
diff --git a/data/gdb/_metadata/version b/data/gdb/_metadata/version index 754d8e034..487285274 100644 --- a/data/gdb/_metadata/version +++ b/data/gdb/_metadata/version @@ -1 +1 @@ -962 +1119 diff --git a/data/gdb/gdb-962.tar.gz b/data/gdb/gdb-1119.tar.gz Binary files differindex a4e781a52..e209c2a58 100644 --- a/data/gdb/gdb-962.tar.gz +++ b/data/gdb/gdb-1119.tar.gz diff --git a/data/gdb/make.sh b/data/gdb/make.sh index 8f1b13d18..d6a7b335e 100644 --- a/data/gdb/make.sh +++ b/data/gdb/make.sh @@ -7,7 +7,7 @@ cd .. mkdir build cd build PKG_CONF=$(echo ../!(build)/src/configure) pkg:configure -make +pkg:make # XXX: do I really need DSTROOT? pkg:install DSTROOT="${PKG_DEST}" for bin in ar nm ranlib size strings strip; do @@ -15,3 +15,4 @@ for bin in ar nm ranlib size strings strip; do done pkg: rm -f /usr/lib/libiberty.a ldid -S"${PKG_DATA}/gdb.xml" "${PKG_DEST}/usr/bin/gdb"{,server} +pkg: rm -rf /usr/share/locale diff --git a/data/gdb/mig.diff b/data/gdb/mig.diff index 2d91566b1..a13474d55 100644 --- a/data/gdb/mig.diff +++ b/data/gdb/mig.diff @@ -1,39 +1,36 @@ -diff -ru gdb-952/src/gdb/config/arm/macosx.mh gdb-952+iPhone/src/gdb/config/arm/macosx.mh ---- gdb-952/src/gdb/config/arm/macosx.mh 2008-03-01 01:24:09.000000000 +0000 -+++ gdb-952+iPhone/src/gdb/config/arm/macosx.mh 2008-04-11 08:41:15.000000000 +0000 -@@ -47,10 +47,10 @@ - - CFM_CFLAGS = -DWITH_CFM=0 - +diff -ru gdb-1119/src/gdb/config/arm/macosx.mh gdb-1119+iPhone/src/gdb/config/arm/macosx.mh +--- gdb-1119/src/gdb/config/arm/macosx.mh 2008-11-18 19:02:00.000000000 +0000 ++++ gdb-1119+iPhone/src/gdb/config/arm/macosx.mh 2009-07-07 11:00:43.000000000 +0000 +@@ -50,7 +50,7 @@ _all: all excServer.c excUser.c: macosx.defs -- $(NEXT_ROOT)/usr/bin/mig -I. $< -+ mig -I. $< +- $(NEXT_ROOT)/usr/bin/mig -arch armv6 -I. $< ++ mig -arch armv6 -I. $< clean:: rm -f excServer.c excUser.c exc.h -diff -ru gdb-952/src/gdb/config/i386/macosx.mh gdb-952+iPhone/src/gdb/config/i386/macosx.mh ---- gdb-952/src/gdb/config/i386/macosx.mh 2008-03-01 01:24:10.000000000 +0000 -+++ gdb-952+iPhone/src/gdb/config/i386/macosx.mh 2008-04-11 08:40:40.000000000 +0000 +diff -ru gdb-1119/src/gdb/config/i386/macosx.mh gdb-1119+iPhone/src/gdb/config/i386/macosx.mh +--- gdb-1119/src/gdb/config/i386/macosx.mh 2008-11-18 19:02:01.000000000 +0000 ++++ gdb-1119+iPhone/src/gdb/config/i386/macosx.mh 2009-07-07 11:00:46.000000000 +0000 @@ -56,7 +56,7 @@ _all: all $(MACH_EXC_SERVER_PREFACE)excServer.c $(MACH_EXC_SERVER_PREFACE)excUser.c: macosx.defs -- $(SDKROOT)/usr/bin/mig -I. $< -+ mig -I. $< +- $(NEXT_ROOT)/usr/bin/mig -arch i386 -I. $< ++ mig -arch i386 -I. $< clean:: rm -f $(MACH_EXC_SERVER_PREFACE)excServer.c $(MACH_EXC_SERVER_PREFACE)excUser.c $(MACH_EXC_SERVER_PREFACE)exc.h -diff -ru gdb-952/src/gdb/config/powerpc/macosx.mh gdb-952+iPhone/src/gdb/config/powerpc/macosx.mh ---- gdb-952/src/gdb/config/powerpc/macosx.mh 2008-03-01 01:24:10.000000000 +0000 -+++ gdb-952+iPhone/src/gdb/config/powerpc/macosx.mh 2008-04-11 08:41:32.000000000 +0000 +diff -ru gdb-1119/src/gdb/config/powerpc/macosx.mh gdb-1119+iPhone/src/gdb/config/powerpc/macosx.mh +--- gdb-1119/src/gdb/config/powerpc/macosx.mh 2008-11-18 19:02:01.000000000 +0000 ++++ gdb-1119+iPhone/src/gdb/config/powerpc/macosx.mh 2009-07-07 11:00:50.000000000 +0000 @@ -60,7 +60,7 @@ _all: all $(MACH_EXC_SERVER_PREFACE)excServer.c $(MACH_EXC_SERVER_PREFACE)excUser.c: macosx.defs -- $(SDKROOT)/usr/bin/mig -I. $< -+ mig -I. $< +- $(NEXT_ROOT)/usr/bin/mig -arch ppc -I. $< ++ mig -arch ppc -I. $< clean:: rm -f $(MACH_EXC_SERVER_PREFACE)excServer.c $(MACH_EXC_SERVER_PREFACE)excUser.c $(MACH_EXC_SERVER_PREFACE)exc.h diff --git a/data/gdb/setpgrp.diff b/data/gdb/setpgrp.diff deleted file mode 100644 index 126274e6e..000000000 --- a/data/gdb/setpgrp.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru gdb-961/src/gdb/macosx/macosx-nat-inferior.c gdb-961+iPhone/src/gdb/macosx/macosx-nat-inferior.c ---- gdb-961/src/gdb/macosx/macosx-nat-inferior.c 2008-05-29 23:05:46.000000000 +0000 -+++ gdb-961+iPhone/src/gdb/macosx/macosx-nat-inferior.c 2008-07-04 11:11:37.000000000 +0000 -@@ -2189,7 +2189,7 @@ - error ("Couldn't set the binary preferences, error: %d", retval); - } - retval = posix_spawnattr_setpgroup (&attr, debug_setpgrp); -- if (retval != 0 || copied != 1) -+ if (retval != 0) - error ("Couldn't set the process group, error: %d", retval); - - retval = posix_spawnp (&new_pid, fileptr, NULL, &attr, argv, env); diff --git a/data/gdb/strip.diff b/data/gdb/strip.diff index 31395be11..365f0f326 100644 --- a/data/gdb/strip.diff +++ b/data/gdb/strip.diff @@ -1,7 +1,7 @@ -diff -ru gdb-961/Makefile gdb-961+iPhone/Makefile ---- gdb-961/Makefile 2008-05-29 23:58:29.000000000 +0000 -+++ gdb-961+iPhone/Makefile 2008-07-04 10:47:06.000000000 +0000 -@@ -287,8 +287,8 @@ +diff -ru gdb-1119/Makefile gdb-1119+iPhone/Makefile +--- gdb-1119/Makefile 2009-04-15 23:42:09.000000000 +0000 ++++ gdb-1119+iPhone/Makefile 2009-07-07 11:02:05.000000000 +0000 +@@ -293,8 +293,8 @@ fi;\ done; (cd $(SYMROOT)/$(LIBEXEC_GDB_DIR)/ ; dsymutil gdb-arm-apple-darwin) @@ -12,18 +12,16 @@ diff -ru gdb-961/Makefile gdb-961+iPhone/Makefile chown root:wheel $(DSTROOT)/$(LIBEXEC_GDB_DIR)/gdb-arm-apple-darwin chmod 755 $(DSTROOT)/$(LIBEXEC_GDB_DIR)/gdb-arm-apple-darwin mkdir -p ${DSTROOT}/usr/bin -@@ -339,8 +339,8 @@ +@@ -372,7 +372,7 @@ fi; \ done; \ - (cd $(SYMROOT)/$(LIBEXEC_GDB_DIR)/ ; dsymutil gdb-$${cross_arch}-apple-darwin); \ -- strip -S -o $(DSTROOT)/$(LIBEXEC_GDB_DIR)/gdb-$${cross_arch}-apple-darwin \ -- $(SYMROOT)/$(LIBEXEC_GDB_DIR)/gdb-$${cross_arch}-apple-darwin; \ -+ cp $(SYMROOT)/$(LIBEXEC_GDB_DIR)/gdb-$${cross_arch}-apple-darwin \ -+ $(DSTROOT)/$(LIBEXEC_GDB_DIR)/gdb-$${cross_arch}-apple-darwin; \ + (cd $(SYMROOT)/$(LIBEXEC_GDB_DIR)/ ; dsymutil gdb-$${target_arch_vendor_os}); \ +- strip -S -o $(DSTROOT)/$(LIBEXEC_GDB_DIR)/gdb-$${target_arch_vendor_os} "$${curr_symroot_output_file}"; \ ++ cp $(DSTROOT)/$(LIBEXEC_GDB_DIR)/gdb-$${target_arch_vendor_os} "$${curr_symroot_output_file}"; \ done; \ mkdir -p ${DSTROOT}/usr/bin; \ sed -e 's/version=.*/version=$(GDB_VERSION)-$(GDB_RC_VERSION)/' \ -@@ -552,8 +552,8 @@ +@@ -690,8 +690,8 @@ -output $(SYMROOT)/$(LIBEXEC_GDB_DIR)/gdb-$${target}; \ dsymutil -o $(SYMROOT)/$(LIBEXEC_GDB_DIR)/gdb-$${target}.dSYM \ $(SYMROOT)/$(LIBEXEC_GDB_DIR)/gdb-$${target}; \ @@ -34,7 +32,7 @@ diff -ru gdb-961/Makefile gdb-961+iPhone/Makefile cp $(DSTROOT)/$(LIBEXEC_GDB_DIR)/gdb-$${target} $(SYMROOT)/$(LIBEXEC_GDB_DIR)/gdb-$${target}; \ done -@@ -567,8 +567,8 @@ +@@ -705,8 +705,8 @@ set -e; for target in $(CANONICAL_ARCHS); do \ dsymutil -o $(SYMROOT)/$(LIBEXEC_GDB_DIR)/gdb-$${target}.dSYM \ $(SYMROOT)/$(LIBEXEC_GDB_DIR)/gdb-$${target}; \ @@ -45,7 +43,7 @@ diff -ru gdb-961/Makefile gdb-961+iPhone/Makefile cp $(DSTROOT)/$(LIBEXEC_GDB_DIR)/gdb-$${target} \ $(SYMROOT)/$(LIBEXEC_GDB_DIR)/gdb-$${target}; \ if echo $${target} | egrep '^[^-]*-apple-darwin' > /dev/null; then \ -@@ -584,7 +584,6 @@ +@@ -722,7 +722,6 @@ set -e; for dstroot in $(SYMROOT) $(DSTROOT); do \ $(INSTALL) -c -m 755 $(OBJROOT)/$(ARM_TARGET)--$(ARM_TARGET)/gdb/gdbserver/gdbserver $${dstroot}/usr/bin/gdbserver; \ done @@ -53,7 +51,7 @@ diff -ru gdb-961/Makefile gdb-961+iPhone/Makefile install-binutils-macosx: -@@ -592,7 +591,7 @@ +@@ -730,7 +729,7 @@ instname=`echo $${i} | sed -e 's/\\-new//'`; \ lipo -create $(patsubst %,$(OBJROOT)/%/binutils/$${i},$(NATIVE_TARGETS)) \ -output $(SYMROOT)/$(LIBEXEC_BINUTILS_DIR)/$${instname}; \ |