i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

patches for building for different targets

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9387 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
shatty
2004-10-18 02:31:12 +00:00
parent 0566c7b352
commit cb14d59346
6 changed files with 53 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile
+9 -2
View File
@@ -4,10 +4,14 @@ UsePrivateHeaders mail ;
SubDirHdrs [ FDirName $(OBOS_TOP) headers os add-ons mail_daemon ] ; SubDirHdrs [ FDirName $(OBOS_TOP) headers os add-ons mail_daemon ] ;
SubDirC++Flags -DBONE ; if $(TARGET_PLATFORM) = r5 {
SubDirC++Flags -DBUILDING_R5_LIBNET ;
} else {
SubDirC++Flags -DBONE ;
}
if $(USESSL) { if $(USESSL) {
SubDirC++Flags -DBONE -DUSESSL ; SubDirC++Flags -DUSESSL ;
SubDirHdrs [ FDirName / boot home config include ] ; SubDirHdrs [ FDirName / boot home config include ] ;
} }
@@ -19,6 +23,9 @@ Addon IMAP : mail_daemon inbound_protocols :
if $(USESSL) { if $(USESSL) {
LinkSharedOSLibs IMAP : LinkSharedOSLibs IMAP :
be libmail.so socket bind ssl crypto ; be libmail.so socket bind ssl crypto ;
} else if $(TARGET_PLATFORM) = r5 {
LinkSharedOSLibs IMAP :
be libmail.so net ;
} else { } else {
LinkSharedOSLibs IMAP : LinkSharedOSLibs IMAP :
be libmail.so socket bind ; be libmail.so socket bind ;
src/add-ons/mail_daemon/inbound_protocols/imap/imap_client.cpp
+8 -8
View File
@@ -19,14 +19,10 @@
#include <unistd.h> #include <unistd.h>
#include <ctype.h> #include <ctype.h>
#ifdef BONE #include <sys/socket.h>
#include <sys/socket.h> #include <arpa/inet.h>
#include <arpa/inet.h> #include <sys/time.h>
#include <sys/time.h> #include <sys/select.h>
#include <sys/select.h>
#else
#include <socket.h>
#endif
#ifdef USESSL #ifdef USESSL
#include <openssl/ssl.h> #include <openssl/ssl.h>
@@ -158,7 +154,11 @@ IMAP4Client::IMAP4Client(BMessage *settings, BMailChainRunner *run) : BRemoteMai
return; return;
} }
#ifdef BONE
net = socket(AF_INET, SOCK_STREAM, 0); net = socket(AF_INET, SOCK_STREAM, 0);
#else
net = socket(AF_INET, 2, 0);
#endif
if (net >= 0) { if (net >= 0) {
struct sockaddr_in saAddr; struct sockaddr_in saAddr;
memset(&saAddr, 0, sizeof(saAddr)); memset(&saAddr, 0, sizeof(saAddr));
src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile
+10 -3
View File
@@ -3,10 +3,14 @@ SubDir OBOS_TOP src add-ons mail_daemon inbound_protocols pop3 ;
UsePrivateHeaders mail ; UsePrivateHeaders mail ;
SubDirHdrs [ FDirName $(OBOS_TOP) headers os add-ons mail_daemon ] ; SubDirHdrs [ FDirName $(OBOS_TOP) headers os add-ons mail_daemon ] ;
SubDirC++Flags -DBONE ; if $(TARGET_PLATFORM) = r5 {
SubDirC++Flags -DBUILDING_R5_LIBNET ;
} else {
SubDirC++Flags -DBONE ;
}
if $(USESSL) { if $(USESSL) {
SubDirC++Flags -DBONE -DUSESSL ; SubDirC++Flags -DUSESSL ;
SubDirHdrs [ FDirName / boot home config include ] ; SubDirHdrs [ FDirName / boot home config include ] ;
} }
@@ -19,9 +23,12 @@ Addon POP3 : mail_daemon inbound_protocols :
if $(USESSL) { if $(USESSL) {
LinkSharedOSLibs POP3 : LinkSharedOSLibs POP3 :
be libmail.so socket bind ssl crypto ; be libmail.so socket bind ssl crypto ;
} else if $(TARGET_PLATFORM) = r5 {
LinkSharedOSLibs POP3 :
be libmail.so net ;
} else { } else {
LinkSharedOSLibs POP3 : LinkSharedOSLibs POP3 :
be libmail.so socket bind ; be libmail.so socket bind ;
} }
Package haiku-maildaemon-cvs : Package haiku-maildaemon-cvs :
src/add-ons/mail_daemon/inbound_protocols/pop3/pop3.cpp
+6 -6
View File
@@ -22,12 +22,8 @@
#include <MDRLanguage.h> #include <MDRLanguage.h>
#ifdef BONE #include <sys/socket.h>
#include <sys/socket.h> #include <arpa/inet.h>
#include <arpa/inet.h>
#else
#include <socket.h>
#endif
#if USESSL #if USESSL
#include <openssl/ssl.h> #include <openssl/ssl.h>
@@ -108,7 +104,11 @@ POP3Protocol::Open(const char *server, int port, int)
return B_NAME_NOT_FOUND; return B_NAME_NOT_FOUND;
} }
#ifdef BONE
conn = socket(AF_INET, SOCK_STREAM, 0); conn = socket(AF_INET, SOCK_STREAM, 0);
#else
conn = socket(AF_INET, 2, 0);
#endif
if (conn >= 0) { if (conn >= 0) {
struct sockaddr_in saAddr; struct sockaddr_in saAddr;
memset(&saAddr, 0, sizeof(saAddr)); memset(&saAddr, 0, sizeof(saAddr));
src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile
+12 -3
View File
@@ -3,14 +3,23 @@ SubDir OBOS_TOP src add-ons mail_daemon outbound_protocols smtp ;
UsePrivateHeaders mail ; UsePrivateHeaders mail ;
SubDirHdrs [ FDirName $(OBOS_TOP) headers os add-ons mail_daemon ] ; SubDirHdrs [ FDirName $(OBOS_TOP) headers os add-ons mail_daemon ] ;
SubDirC++Flags -DBONE ; if $(TARGET_PLATFORM) = r5 {
SubDirC++Flags -DBUILDING_R5_LIBNET ;
} else {
SubDirC++Flags -DBONE ;
}
Addon SMTP : mail_daemon outbound_protocols : Addon SMTP : mail_daemon outbound_protocols :
smtp.cpp smtp.cpp
md5c.c ; md5c.c ;
LinkSharedOSLibs SMTP : if $(TARGET_PLATFORM) = r5 {
be libmail.so socket bind ; LinkSharedOSLibs SMTP :
be libmail.so net ;
} else {
LinkSharedOSLibs SMTP :
be libmail.so socket bind ;
}
Package haiku-maildaemon-cvs : Package haiku-maildaemon-cvs :
SMTP : SMTP :
src/add-ons/mail_daemon/outbound_protocols/smtp/smtp.cpp
+8 -8
View File
@@ -29,14 +29,10 @@
#include <MDRLanguage.h> #include <MDRLanguage.h>
#ifdef BONE #include <sys/socket.h>
#include <sys/socket.h> #include <sys/time.h>
#include <sys/time.h> #include <sys/select.h>
#include <sys/select.h> #include <arpa/inet.h>
#include <arpa/inet.h>
#else
#include <socket.h>
#endif
#define CRLF "\r\n" #define CRLF "\r\n"
#define SMTP_RESPONSE_SIZE 8192 #define SMTP_RESPONSE_SIZE 8192
@@ -181,7 +177,11 @@ SMTPProtocol::Open(const char *address, int port, bool esmtp)
if (hostIP == 0) if (hostIP == 0)
return EHOSTUNREACH; return EHOSTUNREACH;
#ifdef BONE
_fd = socket(AF_INET, SOCK_STREAM, 0); _fd = socket(AF_INET, SOCK_STREAM, 0);
#else
_fd = socket(AF_INET, 2, 0);
#endif
if (_fd >= 0) { if (_fd >= 0) {
struct sockaddr_in saAddr; struct sockaddr_in saAddr;
memset(&saAddr, 0, sizeof(saAddr)); memset(&saAddr, 0, sizeof(saAddr));