summaryrefslogtreecommitdiff
path: root/data/odcctools
diff options
context:
space:
mode:
Diffstat (limited to 'data/odcctools')
l---------data/odcctools/_metadata/openssl.dep1
l---------data/odcctools/_metadata/uuid.dep1
-rw-r--r--data/odcctools/_metadata/version2
-rw-r--r--data/odcctools/make.sh4
-rw-r--r--data/odcctools/odcctools-277.tgzbin2284858 -> 0 bytes
-rw-r--r--data/odcctools/odcctools-286.tgzbin0 -> 2353095 bytes
-rw-r--r--data/odcctools/otool.diff9
-rw-r--r--data/odcctools/usrbin.diff32
8 files changed, 38 insertions, 11 deletions
diff --git a/data/odcctools/_metadata/openssl.dep b/data/odcctools/_metadata/openssl.dep
new file mode 120000
index 000000000..9b58fd56b
--- /dev/null
+++ b/data/odcctools/_metadata/openssl.dep
@@ -0,0 +1 @@
+../../openssl \ No newline at end of file
diff --git a/data/odcctools/_metadata/uuid.dep b/data/odcctools/_metadata/uuid.dep
new file mode 120000
index 000000000..7b224b803
--- /dev/null
+++ b/data/odcctools/_metadata/uuid.dep
@@ -0,0 +1 @@
+../../uuid \ No newline at end of file
diff --git a/data/odcctools/_metadata/version b/data/odcctools/_metadata/version
index 268174779..c20f65747 100644
--- a/data/odcctools/_metadata/version
+++ b/data/odcctools/_metadata/version
@@ -1 +1 @@
-277
+286
diff --git a/data/odcctools/make.sh b/data/odcctools/make.sh
index 94757a91a..9a1f484dc 100644
--- a/data/odcctools/make.sh
+++ b/data/odcctools/make.sh
@@ -2,6 +2,8 @@ pkg:setup
rm -f include/libkern/OSByteOrder.h
rm -f include/mach/{task,thread_act,thread_status}.h
rm -f include/mach/machine/{boolean,exception,kern_return,processor_info,rpc,thread_state,thread_status,vm_param,vm_types}.h
-pkg:configure --disable-ld64 ac_cv_header_objc_objc_runtime_h=no
+pkg:configure --enable-ld64 ac_cv_header_objc_objc_runtime_h=no
make
pkg:install
+pkg: mv /usr/bin/ld{,_classic}
+pkg: ln -s ld64 /usr/bin/ld
diff --git a/data/odcctools/odcctools-277.tgz b/data/odcctools/odcctools-277.tgz
deleted file mode 100644
index f7640b1f9..000000000
--- a/data/odcctools/odcctools-277.tgz
+++ /dev/null
Binary files differ
diff --git a/data/odcctools/odcctools-286.tgz b/data/odcctools/odcctools-286.tgz
new file mode 100644
index 000000000..e8096aa3d
--- /dev/null
+++ b/data/odcctools/odcctools-286.tgz
Binary files differ
diff --git a/data/odcctools/otool.diff b/data/odcctools/otool.diff
index 4097e3473..3d5f28543 100644
--- a/data/odcctools/otool.diff
+++ b/data/odcctools/otool.diff
@@ -74,12 +74,3 @@ diff -ru odcctools-277/otool/print_objc.c odcctools-277+iPhone/otool/print_objc.
};
/*
-@@ -51,7 +55,7 @@
- char *characters;
- unsigned int _length;
- };
--//typedef struct objc_string_object NXConstantString;
-+typedef struct objc_string_object NXConstantString;
-
- #define SIZEHASHTABLE 821
- struct _hashEntry {
diff --git a/data/odcctools/usrbin.diff b/data/odcctools/usrbin.diff
new file mode 100644
index 000000000..e5629d873
--- /dev/null
+++ b/data/odcctools/usrbin.diff
@@ -0,0 +1,32 @@
+diff -ru odcctools-286/as/driver.c odcctools-286+iPhone/as/driver.c
+--- odcctools-286/as/driver.c 2008-07-24 19:20:04.000000000 +0000
++++ odcctools-286+iPhone/as/driver.c 2009-06-30 03:46:53.000000000 +0000
+@@ -31,16 +31,16 @@
+ const char *LIB =
+ #if defined(__OPENSTEP__) || defined(__HERA__) || \
+ defined(__GONZO_BUNSEN_BEAKER__) || defined(__KODIAK__)
+- "../libexec/";
++ "libexec/";
+ #else
+- "../libexec/gcc/darwin/";
++ "libexec/gcc/darwin/";
+ #endif
+ const char *LOCALLIB =
+ #if defined(__OPENSTEP__) || defined(__HERA__) || \
+ defined(__GONZO_BUNSEN_BEAKER__) || defined(__KODIAK__)
+- "../local/libexec/";
++ "local/libexec/";
+ #else
+- "../local/libexec/gcc/darwin/";
++ "local/libexec/gcc/darwin/";
+ #endif
+ const char *AS = "/as";
+
+@@ -73,6 +73,7 @@
+ p = rindex(prefix, '/');
+ if(p != NULL)
+ p[1] = '\0';
++ prefix = "/usr/";
+ /*
+ * Process the assembler flags exactly like the assembler would (except
+ * let the assembler complain about multiple flags, bad combinations of