bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix ucspi-tcp compile

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@17672 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2009-09-22 08:45:44 +00:00
parent 93446143b7
commit af5e83a906
2 changed files with 42 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
net/ucspi-tcp/Makefile
View File

@ -37,6 +37,7 @@ define Build/Compile
TARGET_CC="$(TARGET_CC)" \ TARGET_CC="$(TARGET_CC)" \
TARGET_CFLAGS="$(TARGET_CFLAGS)" \ TARGET_CFLAGS="$(TARGET_CFLAGS)" \
TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \ TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \
TARGET_RANLIB="$(TARGET_CROSS)ranlib" \
$(MAKE) -C $(PKG_BUILD_DIR) $(MAKE) -C $(PKG_BUILD_DIR)
endef endef

86
net/ucspi-tcp/patches/crosscompile.patch → net/ucspi-tcp/patches/100-cross_compile.patch
View File

@ -1,7 +1,6 @@
diff -urN ucspi-tcp-0.88/Makefile ucspi-tcp-0.88.new/Makefile --- a/Makefile
--- ucspi-tcp-0.88/Makefile 2000-03-18 17:18:42.000000000 +0200 +++ b/Makefile
+++ ucspi-tcp-0.88.new/Makefile 2007-09-30 16:32:55.000000000 +0300 @@ -36,10 +36,6 @@ auto-str.o: \
@@ -36,10 +36,6 @@
compile auto-str.c buffer.h readwrite.h exit.h compile auto-str.c buffer.h readwrite.h exit.h
./compile auto-str.c ./compile auto-str.c
@ -12,7 +11,7 @@ diff -urN ucspi-tcp-0.88/Makefile ucspi-tcp-0.88.new/Makefile
auto_home.o: \ auto_home.o: \
compile auto_home.c compile auto_home.c
./compile auto_home.c ./compile auto_home.c
@@ -305,10 +301,6 @@ @@ -305,10 +301,6 @@ fmt_ulong.o: \
compile fmt_ulong.c fmt.h compile fmt_ulong.c fmt.h
./compile fmt_ulong.c ./compile fmt_ulong.c
@ -23,7 +22,7 @@ diff -urN ucspi-tcp-0.88/Makefile ucspi-tcp-0.88.new/Makefile
getln.o: \ getln.o: \
compile getln.c byte.h getln.h buffer.h stralloc.h gen_alloc.h compile getln.c byte.h getln.h buffer.h stralloc.h gen_alloc.h
./compile getln.c ./compile getln.c
@@ -317,24 +309,6 @@ @@ -317,24 +309,6 @@ getln2.o: \
compile getln2.c byte.h getln.h buffer.h stralloc.h gen_alloc.h compile getln2.c byte.h getln.h buffer.h stralloc.h gen_alloc.h
./compile getln2.c ./compile getln2.c
@ -48,7 +47,7 @@ diff -urN ucspi-tcp-0.88/Makefile ucspi-tcp-0.88.new/Makefile
hier.o: \ hier.o: \
compile hier.c auto_home.h compile hier.c auto_home.h
./compile hier.c ./compile hier.c
@@ -362,10 +336,6 @@ @@ -362,10 +336,6 @@ instcheck.o: \
compile instcheck.c strerr.h error.h readwrite.h exit.h compile instcheck.c strerr.h error.h readwrite.h exit.h
./compile instcheck.c ./compile instcheck.c
@ -59,7 +58,16 @@ diff -urN ucspi-tcp-0.88/Makefile ucspi-tcp-0.88.new/Makefile
iopause.o: \ iopause.o: \
compile iopause.c taia.h tai.h uint64.h select.h iopause.h taia.h compile iopause.c taia.h tai.h uint64.h select.h iopause.h taia.h
./compile iopause.c ./compile iopause.c
@@ -521,10 +491,6 @@ @@ -404,7 +374,7 @@ warn-auto.sh systype
dgux-*) ;; \
hp-ux-*) ;; \
sco*) ;; \
- *) echo 'ranlib "$$main"' ;; \
+ *) echo '$(if $(TARGET_RANLIB),$(TARGET_RANLIB),ranlib) "$$main"' ;; \
esac \
) > makelib
chmod 755 makelib
@@ -521,10 +491,6 @@ seek_set.o: \
compile seek_set.c seek.h compile seek_set.c seek.h
./compile seek_set.c ./compile seek_set.c
@ -70,7 +78,7 @@ diff -urN ucspi-tcp-0.88/Makefile ucspi-tcp-0.88.new/Makefile
setup: \ setup: \
it install it install
./install ./install
@@ -791,10 +757,6 @@ @@ -791,10 +757,6 @@ uint32_unpack.o: \
compile uint32_unpack.c uint32.h compile uint32_unpack.c uint32.h
./compile uint32_unpack.c ./compile uint32_unpack.c
@ -81,41 +89,36 @@ diff -urN ucspi-tcp-0.88/Makefile ucspi-tcp-0.88.new/Makefile
unix.a: \ unix.a: \
makelib alloc.o alloc_re.o buffer.o buffer_0.o buffer_1.o buffer_2.o \ makelib alloc.o alloc_re.o buffer.o buffer_0.o buffer_1.o buffer_2.o \
buffer_copy.o buffer_get.o buffer_put.o env.o error.o error_str.o \ buffer_copy.o buffer_get.o buffer_put.o env.o error.o error_str.o \
diff -urN ucspi-tcp-0.88/auto_home.c ucspi-tcp-0.88.new/auto_home.c --- /dev/null
--- ucspi-tcp-0.88/auto_home.c 1970-01-01 03:00:00.000000000 +0300 +++ b/auto_home.c
+++ ucspi-tcp-0.88.new/auto_home.c 2007-09-30 16:33:13.000000000 +0300
@@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
+const char auto_home[] = "\ +const char auto_home[] = "\
+\057\165\163\162\ +\057\165\163\162\
+"; +";
diff -urN ucspi-tcp-0.88/conf-cc ucspi-tcp-0.88.new/conf-cc --- a/conf-cc
--- ucspi-tcp-0.88/conf-cc 2007-09-30 14:17:05.000000000 +0300 +++ b/conf-cc
+++ ucspi-tcp-0.88.new/conf-cc 2007-09-30 15:13:43.000000000 +0300
@@ -1,3 +1,3 @@ @@ -1,3 +1,3 @@
-gcc -O2 -gcc -O2
+$TARGET_CC $TARGET_CFLAGS -include errno.h +$TARGET_CC $TARGET_CFLAGS -include errno.h
This will be used to compile .c files. This will be used to compile .c files.
diff -urN ucspi-tcp-0.88/conf-home ucspi-tcp-0.88.new/conf-home --- a/conf-home
--- ucspi-tcp-0.88/conf-home 2000-03-18 17:18:42.000000000 +0200 +++ b/conf-home
+++ ucspi-tcp-0.88.new/conf-home 2007-09-30 14:12:46.000000000 +0300
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-/usr/local -/usr/local
+/usr +/usr
This is the ucspi-tcp home directory. Programs will be installed in This is the ucspi-tcp home directory. Programs will be installed in
.../bin. .../bin.
diff -urN ucspi-tcp-0.88/conf-ld ucspi-tcp-0.88.new/conf-ld --- a/conf-ld
--- ucspi-tcp-0.88/conf-ld 2000-03-18 17:18:42.000000000 +0200 +++ b/conf-ld
+++ ucspi-tcp-0.88.new/conf-ld 2007-09-30 15:13:53.000000000 +0300
@@ -1,3 +1,3 @@ @@ -1,3 +1,3 @@
-gcc -s -gcc -s
+$TARGET_CC -s $TARGET_LDFLAGS +$TARGET_CC -s $TARGET_LDFLAGS
This will be used to link .o files into an executable. This will be used to link .o files into an executable.
diff -urN ucspi-tcp-0.88/fork.h ucspi-tcp-0.88.new/fork.h --- /dev/null
--- ucspi-tcp-0.88/fork.h 1970-01-01 03:00:00.000000000 +0300 +++ b/fork.h
+++ ucspi-tcp-0.88.new/fork.h 2007-09-30 14:09:38.000000000 +0300
@@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
+#ifndef FORK_H +#ifndef FORK_H
+#define FORK_H +#define FORK_H
@ -126,32 +129,27 @@ diff -urN ucspi-tcp-0.88/fork.h ucspi-tcp-0.88.new/fork.h
+extern int vfork(); +extern int vfork();
+ +
+#endif +#endif
diff -urN ucspi-tcp-0.88/hassgact.h ucspi-tcp-0.88.new/hassgact.h --- /dev/null
--- ucspi-tcp-0.88/hassgact.h 1970-01-01 03:00:00.000000000 +0300 +++ b/hassgact.h
+++ ucspi-tcp-0.88.new/hassgact.h 2007-09-30 14:09:38.000000000 +0300
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
+/* sysdep: +sigaction */ +/* sysdep: +sigaction */
+#define HASSIGACTION 1 +#define HASSIGACTION 1
diff -urN ucspi-tcp-0.88/hassgprm.h ucspi-tcp-0.88.new/hassgprm.h --- /dev/null
--- ucspi-tcp-0.88/hassgprm.h 1970-01-01 03:00:00.000000000 +0300 +++ b/hassgprm.h
+++ ucspi-tcp-0.88.new/hassgprm.h 2007-09-30 14:09:38.000000000 +0300
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
+/* sysdep: +sigprocmask */ +/* sysdep: +sigprocmask */
+#define HASSIGPROCMASK 1 +#define HASSIGPROCMASK 1
diff -urN ucspi-tcp-0.88/hasshsgr.h ucspi-tcp-0.88.new/hasshsgr.h --- /dev/null
--- ucspi-tcp-0.88/hasshsgr.h 1970-01-01 03:00:00.000000000 +0300 +++ b/hasshsgr.h
+++ ucspi-tcp-0.88.new/hasshsgr.h 2007-09-30 14:09:38.000000000 +0300
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+/* sysdep: -shortsetgroups */ +/* sysdep: -shortsetgroups */
diff -urN ucspi-tcp-0.88/haswaitp.h ucspi-tcp-0.88.new/haswaitp.h --- /dev/null
--- ucspi-tcp-0.88/haswaitp.h 1970-01-01 03:00:00.000000000 +0300 +++ b/haswaitp.h
+++ ucspi-tcp-0.88.new/haswaitp.h 2007-09-30 14:09:38.000000000 +0300
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
+/* sysdep: +waitpid */ +/* sysdep: +waitpid */
+#define HASWAITPID 1 +#define HASWAITPID 1
diff -urN ucspi-tcp-0.88/iopause.h ucspi-tcp-0.88.new/iopause.h --- /dev/null
--- ucspi-tcp-0.88/iopause.h 1970-01-01 03:00:00.000000000 +0300 +++ b/iopause.h
+++ ucspi-tcp-0.88.new/iopause.h 2007-09-30 14:09:38.000000000 +0300
@@ -0,0 +1,18 @@ @@ -0,0 +1,18 @@
+#ifndef IOPAUSE_H +#ifndef IOPAUSE_H
+#define IOPAUSE_H +#define IOPAUSE_H
@ -171,9 +169,8 @@ diff -urN ucspi-tcp-0.88/iopause.h ucspi-tcp-0.88.new/iopause.h
+extern void iopause(iopause_fd *,unsigned int,struct taia *,struct taia *); +extern void iopause(iopause_fd *,unsigned int,struct taia *,struct taia *);
+ +
+#endif +#endif
diff -urN ucspi-tcp-0.88/select.h ucspi-tcp-0.88.new/select.h --- /dev/null
--- ucspi-tcp-0.88/select.h 1970-01-01 03:00:00.000000000 +0300 +++ b/select.h
+++ ucspi-tcp-0.88.new/select.h 2007-09-30 14:09:38.000000000 +0300
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
+#ifndef SELECT_H +#ifndef SELECT_H
+#define SELECT_H +#define SELECT_H
@ -186,9 +183,8 @@ diff -urN ucspi-tcp-0.88/select.h ucspi-tcp-0.88.new/select.h
+extern int select(); +extern int select();
+ +
+#endif +#endif
diff -urN ucspi-tcp-0.88/uint64.h ucspi-tcp-0.88.new/uint64.h --- /dev/null
--- ucspi-tcp-0.88/uint64.h 1970-01-01 03:00:00.000000000 +0300 +++ b/uint64.h
+++ ucspi-tcp-0.88.new/uint64.h 2007-09-30 14:16:22.000000000 +0300
@@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
+#ifndef UINT64_H +#ifndef UINT64_H
+#define UINT64_H +#define UINT64_H