From 707828b71af1d155206cf7039569e9cffb110649 Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Tue, 11 Nov 2008 01:12:17 +0000
Subject: [PATCH] Related with bug #2230535
(http://curl.haxx.se/bug/view.cgi?id=2230535) Daniel Fandrich noticed that
curl_addrinfo was also missing in the build process of other four
non-configure platforms. Added now.
---
CHANGES | 5 +++++
RELEASE-NOTES | 4 ++--
lib/Makefile.riscos | 7 +++++--
lib/libcurl.framework.make | 1 +
lib/makefile.amiga | 2 +-
packages/Symbian/group/libcurl.mmp | 2 +-
6 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/CHANGES b/CHANGES
index 71d3b52b7c..fa6212b349 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,11 @@
Changelog
+Yang Tse (11 Nov 2008)
+- Related with bug #2230535 (http://curl.haxx.se/bug/view.cgi?id=2230535)
+ Daniel Fandrich noticed that curl_addrinfo was also missing in the build
+ process of other four non-configure platforms. Added now.
+
Daniel Fandrich (7 Nov 2008)
- The getifaddrs() version of Curl_if2ip() crashed when used on a Linux
system with a TEQL load-balancing device configured, which doesn't
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 1d8d76d813..600ca17f00 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -13,7 +13,7 @@ This release includes the following changes:
This release includes the following bugfixes:
- o build failure when using MSVC 6 makefile
+ o build failure when using MSVC 6 makefile and on four platforms more
o crash when using --interface name on Linux systems with a TEQL device
This release includes the following known bugs:
@@ -27,6 +27,6 @@ Other curl-related news:
This release would not have looked like this without help, code, reports and
advice from friends like these:
- John Wilkinson, Adam Sampson
+ John Wilkinson, Adam Sampson, Daniel Fandrich, Yang Tse
Thanks! (and sorry if I forgot to mention someone)
diff --git a/lib/Makefile.riscos b/lib/Makefile.riscos
index 0304b45584..04ae5d6861 100644
--- a/lib/Makefile.riscos
+++ b/lib/Makefile.riscos
@@ -7,13 +7,13 @@ objs = o.base64 o.connect o.cookie o.dict \
o.dllinit o.easy o.escape o.file \
o.formdata o.ftp o.getenv \
o.getinfo o.getpass o.hostip \
- o.hostip4 o.hostsyn o.http \
+ o.hostip4 o.hostsyn o.http \
o.http_chunks o.inet_ntop o.inet_pton o.if2ip o.krb4 o.ldap \
o.memdebug o.mprintf o.netrc o.parsedate o.progress \
o.security o.select o.sendf o.speedcheck o.ssluse \
o.strequal o.strtok o.telnet o.timeval \
o.transfer o.url o.version o.strtoofft o.sslgen o.gtls \
- o.rawstr
+ o.rawstr o.curl_addrinfo
# Compile options:
linkopts = -o libcurl
@@ -33,6 +33,9 @@ o.connect: c.connect
o.cookie: c.cookie
gcc $(compileropts) -c -o cookie.o c.cookie
+o.curl_addrinfo: c.curl_addrinfo
+ gcc $(compileropts) -c -o curl_addrinfo.o c.curl_addrinfo
+
o.dict: c.dict
gcc $(compileropts) -c -o dict.o c.dict
diff --git a/lib/libcurl.framework.make b/lib/libcurl.framework.make
index 6289642319..3b9a5e0cc7 100644
--- a/lib/libcurl.framework.make
+++ b/lib/libcurl.framework.make
@@ -48,6 +48,7 @@ OBJECTS = $(TMP_DIR)/base64.o \
$(TMP_DIR)/connect.o \
$(TMP_DIR)/content_encoding.o \
$(TMP_DIR)/cookie.o \
+ $(TMP_DIR)/curl_addrinfo.o \
$(TMP_DIR)/dict.o \
$(TMP_DIR)/easy.o \
$(TMP_DIR)/escape.o \
diff --git a/lib/makefile.amiga b/lib/makefile.amiga
index e2ba6a83ea..504c20cb12 100644
--- a/lib/makefile.amiga
+++ b/lib/makefile.amiga
@@ -17,7 +17,7 @@ OBJS = amigaos.c base64.c connect.c content_encoding.c cookie.c dict.c easy.c \
ldap.c llist.c md5.c memdebug.c mprintf.c multi.c netrc.c parsedate.c \
progress.c security.c select.c sendf.c share.c speedcheck.c ssluse.c \
strequal.c strtok.c telnet.c timeval.c transfer.c url.c version.c \
- sslgen.c gtls.c strerror.c rawstr.c
+ sslgen.c gtls.c strerror.c rawstr.c curl_addrinfo.c
all: $(OBJS:.c=.o)
ar cru libcurl.a $(OBJS:.c=.o)
diff --git a/packages/Symbian/group/libcurl.mmp b/packages/Symbian/group/libcurl.mmp
index 17749d9c4b..10357b9ec3 100644
--- a/packages/Symbian/group/libcurl.mmp
+++ b/packages/Symbian/group/libcurl.mmp
@@ -30,7 +30,7 @@ SOURCE \
http_negotiate.c http_ntlm.c inet_pton.c strtoofft.c strerror.c \
hostares.c hostasyn.c hostip4.c hostip6.c hostsyn.c hostthre.c \
inet_ntop.c parsedate.c select.c gtls.c sslgen.c tftp.c splay.c \
- strdup.c socks.c ssh.c nss.c qssl.c rawstr.c
+ strdup.c socks.c ssh.c nss.c qssl.c rawstr.c curl_addrinfo.c
USERINCLUDE ../../../lib ../../../include/curl
--
GitLab