summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Bingner <sam@bingner.com>2018-08-15 12:35:24 -1000
committerSam Bingner <sam@bingner.com>2018-08-15 12:35:24 -1000
commit2fa3c274ced789bdfb7eedc08d29b8c5c37ddecf (patch)
tree69528d34178d5e8d9080a00ba5b78e2cc8cfd049
parentf96db1728b8d9196fd1d47d957318ab7c1e57861 (diff)
Make afpfs-ng compile for 64bit
-rw-r--r--data/afpfs-ng/extern.diff12
-rw-r--r--data/afpfs-ng/make.sh2
-rw-r--r--data/afpfs-ng/nullreturn.diff24
3 files changed, 37 insertions, 1 deletions
diff --git a/data/afpfs-ng/extern.diff b/data/afpfs-ng/extern.diff
new file mode 100644
index 000000000..ca53c9ecb
--- /dev/null
+++ b/data/afpfs-ng/extern.diff
@@ -0,0 +1,12 @@
+diff -ur afpfs-ng-0.8.1/cmdline/cmdline_afp.h afpfs-ng-0.8.1+iPhone/cmdline/cmdline_afp.h
+--- afpfs-ng-0.8.1/cmdline/cmdline_afp.h 2008-02-17 17:51:20.000000000 -1000
++++ afpfs-ng-0.8.1+iPhone/cmdline/cmdline_afp.h 2018-08-01 15:49:36.000000000 -1000
+@@ -1,7 +1,7 @@
+ #ifndef CMDLINE_AFP_H_
+ #define CMDLINE_AFP_H_
+
+-int full_url;
++extern int full_url;
+
+ int com_connect(char * arg);
+ int com_dir(char * arg);
diff --git a/data/afpfs-ng/make.sh b/data/afpfs-ng/make.sh
index 7dac292bc..dc6b1ecb8 100644
--- a/data/afpfs-ng/make.sh
+++ b/data/afpfs-ng/make.sh
@@ -1,5 +1,5 @@
pkg:setup
-autoconf
+autoreconf -f -i
pkg:configure
make
pkg:install
diff --git a/data/afpfs-ng/nullreturn.diff b/data/afpfs-ng/nullreturn.diff
new file mode 100644
index 000000000..f8c3768ac
--- /dev/null
+++ b/data/afpfs-ng/nullreturn.diff
@@ -0,0 +1,24 @@
+diff -ur afpfs-ng-0.8.1/include/afp.h afpfs-ng-0.8.1+iPhone/include/afp.h
+--- afpfs-ng-0.8.1/include/afp.h 2008-03-08 06:08:18.000000000 -1000
++++ afpfs-ng-0.8.1+iPhone/include/afp.h 2018-08-01 15:45:07.000000000 -1000
+@@ -308,7 +308,7 @@
+
+ struct afp_server * afp_server_full_connect(void * priv, struct afp_connection_request * req);
+
+-void * just_end_it_now(void *other);
++void just_end_it_now(void *other);
+ void add_fd_and_signal(int fd);
+ void loop_disconnect(struct afp_server *s);
+ void afp_wait_for_started_loop(void);
+diff -ur afpfs-ng-0.8.1/lib/loop.c afpfs-ng-0.8.1+iPhone/lib/loop.c
+--- afpfs-ng-0.8.1/lib/loop.c 2008-02-17 17:40:11.000000000 -1000
++++ afpfs-ng-0.8.1+iPhone/lib/loop.c 2018-08-01 15:44:28.000000000 -1000
+@@ -85,7 +85,7 @@
+ }
+
+ static int ending=0;
+-void * just_end_it_now(void * ignore)
++void just_end_it_now(void * ignore)
+ {
+ if (ending) return;
+ ending=1;