haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-06 06:58:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

axel: fix build, recipe cleanup, reduced patchset (#1278)

Browse Source
This commit is contained in:
miqlas
2017-04-16 19:29:13 +02:00
committed by waddlesplash
parent b5b976e821
commit af8361333b
3 changed files with 59 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
net-misc/axel/patches/axel-2.4.patch
View File

@@ -1,36 +0,0 @@
diff -urN axel-2.4/configure axel-2.4-haiku/configure
--- axel-2.4/configure 2009-06-12 09:21:27.000000000 +0000
+++ axel-2.4-haiku/configure 2009-06-12 09:16:10.000000000 +0000
@@ -200,6 +200,26 @@
echo 'Please keep in mind that you need GNU make to make Axel!'
echo ''
;;
+Haiku* )
+ echo 'LFLAGS+=-lnetwork' >> Makefile.settings
+ echo '#define NOGETOPTLONG' >> config.h
+# intl not yet working on Haiku
+# if [ "$i18n" = "1" ]; then
+# echo 'LFLAGS+=-lintl' >> Makefile.settings;
+# fi
+ echo '#define _IO(x,y) (IOC_VOID|((x)<<8)|y)' >> config.h
+ echo '#define _IOR(x,y,t) (IOC_OUT|((sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|y)' >> config.h
+ echo '#define _IOW(x,y,t) (IOC_IN|((sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|y)' >> config.h
+# echo '/* this should be _IORW, but stdio got there first */' >> config.h
+ echo '#define _IOWR(x,y,t) (IOC_INOUT|((sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|y)' >> config.h
+ echo "#define SIOCGIFADDR _IOWR('i',13, struct ifreq) /* get ifnet address */" >> config.h
+ echo '#define IOCPARM_MASK 0x7f /* parameters must be < 128 bytes */' >> config.h
+ echo '#define IOC_VOID 0x20000000 /* no parameters */' >> config.h
+ echo '#define IOC_OUT 0x40000000 /* copy out parameters */' >> config.h
+ echo '#define IOC_IN 0x80000000 /* copy in parameters */' >> config.h
+ echo '#define IOC_INOUT (IOC_IN|IOC_OUT)' >> config.h
+# echo '/* the 0x20000000 is so we can distinguish new ioctl's from old */' >> config.h
+;;
CYGWIN_* )
echo 'LFLAGS+=-lpthread' >> Makefile.settings
if [ "$i18n" = "1" ]; then
Binary files axel-2.4/conn.o and axel-2.4-haiku/conn.o differ
Binary files axel-2.4/ftp.o and axel-2.4-haiku/ftp.o differ
Binary files axel-2.4/http.o and axel-2.4-haiku/http.o differ
Binary files axel-2.4/search.o and axel-2.4-haiku/search.o differ
Binary files axel-2.4/tcp.o and axel-2.4-haiku/tcp.o differ
Binary files axel-2.4/text.o and axel-2.4-haiku/text.o differ

41
net-misc/axel/patches/axel-2.4.patchset Normal file
View File

@@ -0,0 +1,41 @@
From f86df22189a39918521e4b3470376e5bb6d77f17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sun, 16 Apr 2017 18:58:10 +0200
Subject: Haiku supporting patchset
diff --git a/configure b/configure
index 81ecb99..3e1e838 100755
--- a/configure
+++ b/configure
@@ -200,6 +200,12 @@ SunOS )
echo 'Please keep in mind that you need GNU make to make Axel!'
echo ''
;;
+Haiku* )
+ echo 'LFLAGS+=-lnetwork' >> Makefile.settings
+ if [ "$i18n" = "1" ]; then
+ echo 'LFLAGS+=-lintl' >> Makefile.settings;
+ fi
+;;
CYGWIN_* )
echo 'LFLAGS+=-lpthread' >> Makefile.settings
if [ "$i18n" = "1" ]; then
diff --git a/tcp.c b/tcp.c
index 1551c23..7366c20 100644
--- a/tcp.c
+++ b/tcp.c
@@ -25,6 +25,10 @@
#include "axel.h"
+#ifdef __HAIKU__
+#include <sys/sockio.h>
+#endif
+
/* Get a TCP connection */
int tcp_connect( char *hostname, int port, char *local_if )
{
--
2.12.2