mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 19:50:05 +02:00
wget: fix gcc2 build.
* remove old recipe.
This commit is contained in:
Jerome Duval
@@ -1,162 +0,0 @@
|
||||
From 83963691192c71c9306b5af56509fc921763f468 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Mon, 19 May 2014 15:38:37 +0000
|
||||
Subject: apply wget-1.14.patch
|
||||
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 09b81e6..18b156d 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -234,6 +234,7 @@ AC_HEADER_STDBOOL
|
||||
AC_CHECK_HEADERS(unistd.h sys/time.h)
|
||||
AC_CHECK_HEADERS(termios.h sys/ioctl.h sys/select.h utime.h sys/utime.h)
|
||||
AC_CHECK_HEADERS(stdint.h inttypes.h pwd.h wchar.h)
|
||||
+AC_CHECK_HEADERS(arpa/inet.h)
|
||||
|
||||
AC_CHECK_DECLS(h_errno,,,[#include <netdb.h>])
|
||||
|
||||
diff --git a/m4/wget.m4 b/m4/wget.m4
|
||||
index 777e973..5a8b75d 100644
|
||||
--- a/m4/wget.m4
|
||||
+++ b/m4/wget.m4
|
||||
@@ -88,6 +88,7 @@ AC_DEFUN([WGET_POSIX_CLOCK], [
|
||||
|
||||
dnl Check whether we need to link with -lnsl and -lsocket, as is the
|
||||
dnl case on e.g. Solaris.
|
||||
+dnl Haiku needs libnetwork
|
||||
|
||||
AC_DEFUN([WGET_NSL_SOCKET], [
|
||||
dnl On Solaris, -lnsl is needed to use gethostbyname. But checking
|
||||
@@ -107,6 +108,8 @@ AC_DEFUN([WGET_NSL_SOCKET], [
|
||||
AC_CHECK_LIB(nsl, $wget_check_in_nsl)
|
||||
fi
|
||||
AC_CHECK_LIB(socket, socket)
|
||||
+ AC_CHECK_LIB(network, gethostbyname)
|
||||
+ AC_CHECK_LIB(network, socket)
|
||||
])
|
||||
|
||||
|
||||
diff --git a/src/config.h.in b/src/config.h.in
|
||||
index e8f4170..664bad4 100644
|
||||
--- a/src/config.h.in
|
||||
+++ b/src/config.h.in
|
||||
@@ -747,6 +747,9 @@
|
||||
/* Define to 1 if you have the <langinfo.h> header file. */
|
||||
#undef HAVE_LANGINFO_H
|
||||
|
||||
+/* Define to 1 if you have the `bind' library (-lbind). */
|
||||
+#undef HAVE_LIBBIND
|
||||
+
|
||||
/* Define to 1 if you have the `dl' library (-ldl). */
|
||||
#undef HAVE_LIBDL
|
||||
|
||||
@@ -759,6 +762,9 @@
|
||||
/* Define to 1 if you have the <libintl.h> header file. */
|
||||
#undef HAVE_LIBINTL_H
|
||||
|
||||
+/* Define to 1 if you have the `network' library (-lnetwork). */
|
||||
+#undef HAVE_LIBNETWORK
|
||||
+
|
||||
/* Define to 1 if you have the `nsl' library (-lnsl). */
|
||||
#undef HAVE_LIBNSL
|
||||
|
||||
diff --git a/src/connect.c b/src/connect.c
|
||||
index 024b231..433f451 100644
|
||||
--- a/src/connect.c
|
||||
+++ b/src/connect.c
|
||||
@@ -46,7 +46,7 @@ as that of the covered work. */
|
||||
# include <netdb.h>
|
||||
# endif /* def __VMS [else] */
|
||||
# include <netinet/in.h>
|
||||
-# ifndef __BEOS__
|
||||
+# ifdef HAVE_ARPA_INET_H
|
||||
# include <arpa/inet.h>
|
||||
# endif
|
||||
#endif /* not WINDOWS */
|
||||
diff --git a/src/host.h b/src/host.h
|
||||
index 785a570..3ef63cd 100644
|
||||
--- a/src/host.h
|
||||
+++ b/src/host.h
|
||||
@@ -42,9 +42,9 @@ as that of the covered work. */
|
||||
# endif /* def __VMS [else] */
|
||||
# include <sys/socket.h>
|
||||
# include <netinet/in.h>
|
||||
-#ifndef __BEOS__
|
||||
-# include <arpa/inet.h>
|
||||
-#endif
|
||||
+# ifdef HAVE_ARPA_INET_H
|
||||
+# include <arpa/inet.h>
|
||||
+# endif
|
||||
#endif
|
||||
|
||||
struct url;
|
||||
--
|
||||
2.7.0
|
||||
|
||||
|
||||
From 90e705554fff2aae61e556bb985bc96cfc0a73fc Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Mon, 19 May 2014 15:47:24 +0000
|
||||
Subject: apply and augment wget-1.14-build-fixes.patch
|
||||
|
||||
|
||||
diff --git a/src/utils.c b/src/utils.c
|
||||
index 5222851..4e5a5c2 100644
|
||||
--- a/src/utils.c
|
||||
+++ b/src/utils.c
|
||||
@@ -65,7 +65,9 @@ as that of the covered work. */
|
||||
|
||||
/* For TIOCGWINSZ and friends: */
|
||||
#ifndef WINDOWS
|
||||
+#ifndef __HAIKU__
|
||||
# include <sys/ioctl.h>
|
||||
+#endif
|
||||
# include <termios.h>
|
||||
#endif
|
||||
|
||||
--
|
||||
2.7.0
|
||||
|
||||
|
||||
From 9e8233ced955d796f2807085529550a048f64397 Mon Sep 17 00:00:00 2001
|
||||
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
||||
Date: Sun, 14 Feb 2016 11:05:10 +0100
|
||||
Subject: Move wget-hsts out of home directory.
|
||||
|
||||
|
||||
diff --git a/src/main.c b/src/main.c
|
||||
index 4641008..f60cac9 100644
|
||||
--- a/src/main.c
|
||||
+++ b/src/main.c
|
||||
@@ -78,6 +78,10 @@ as that of the covered work. */
|
||||
# include "vms.h"
|
||||
#endif /* __VMS */
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+#include "FindDirectory.h"
|
||||
+#endif
|
||||
+
|
||||
#ifndef PATH_SEPARATOR
|
||||
# define PATH_SEPARATOR '/'
|
||||
#endif
|
||||
@@ -154,6 +158,16 @@ get_hsts_database (void)
|
||||
if (opt.hsts_file)
|
||||
return xstrdup (opt.hsts_file);
|
||||
|
||||
+#ifdef __HAIKU__
|
||||
+ {
|
||||
+ char buffer[256];
|
||||
+ if (find_directory(B_USER_SETTINGS_DIRECTORY, 0, false, buffer, sizeof(buffer)) == B_OK) {
|
||||
+ home = aprintf("%s/wget-hsts", buffer);
|
||||
+ return home;
|
||||
+ }
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
home = home_dir ();
|
||||
if (home)
|
||||
{
|
||||
--
|
||||
2.7.0
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From bde15653f181802cbd9ac661f40de5c0604020ab Mon Sep 17 00:00:00 2001
|
||||
From bd11396e597c8a9e1134a56e85fe64de65a4641c Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Mon, 19 May 2014 15:38:37 +0000
|
||||
Subject: apply wget-1.14.patch
|
||||
@@ -81,10 +81,10 @@ index 785a570..3ef63cd 100644
|
||||
|
||||
struct url;
|
||||
--
|
||||
2.10.2
|
||||
2.7.0
|
||||
|
||||
|
||||
From 31f227097a4615c99649da25efaf3c72310ce726 Mon Sep 17 00:00:00 2001
|
||||
From e25da0597937e8dcad6c6d2fce99536da79464e3 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Mon, 19 May 2014 15:47:24 +0000
|
||||
Subject: apply and augment wget-1.14-build-fixes.patch
|
||||
@@ -105,10 +105,10 @@ index db89ae1..f2a11ff 100644
|
||||
#endif
|
||||
|
||||
--
|
||||
2.10.2
|
||||
2.7.0
|
||||
|
||||
|
||||
From c9be4a66b439c9fe3364879fece245bbe391fa02 Mon Sep 17 00:00:00 2001
|
||||
From d8074e2ce1894326fccf5932edc9e23b105dc7a4 Mon Sep 17 00:00:00 2001
|
||||
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
||||
Date: Sun, 14 Feb 2016 11:05:10 +0100
|
||||
Subject: Move wget-hsts out of home directory.
|
||||
@@ -147,5 +147,28 @@ index 581a33d..e8268c7 100644
|
||||
if (home)
|
||||
{
|
||||
--
|
||||
2.10.2
|
||||
2.7.0
|
||||
|
||||
|
||||
From 3cb17cf7796926a75c57213b0995b06a96e352f1 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Mon, 22 May 2017 18:46:27 +0200
|
||||
Subject: gcc2 patch
|
||||
|
||||
|
||||
diff --git a/src/init.c b/src/init.c
|
||||
index e6aa673..a705ff9 100644
|
||||
--- a/src/init.c
|
||||
+++ b/src/init.c
|
||||
@@ -880,7 +880,7 @@ setval_internal (int comind, const char *com, const char *val)
|
||||
assert (0 <= comind && ((size_t) comind) < countof (commands));
|
||||
|
||||
if ((unsigned) comind >= countof (commands))
|
||||
- return NULL;
|
||||
+ return false;
|
||||
|
||||
DEBUGP (("Setting %s (%s) to %s\n", com, commands[comind].name, val));
|
||||
return commands[comind].action (com, val, commands[comind].place);
|
||||
--
|
||||
2.7.0
|
||||
|
||||
|
||||
@@ -1,77 +0,0 @@
|
||||
SUMMARY="A tool for downloading files from the internet"
|
||||
DESCRIPTION="
|
||||
wget is a tool that can download files from the internet through protocols \
|
||||
such as HTTP, HTTPS and FTP. wget is non-interactive, so it can be called from \
|
||||
scripts.
|
||||
"
|
||||
HOMEPAGE="http://www.gnu.org/software/wget"
|
||||
SOURCE_URI="http://ftp.gnu.org/gnu/wget/wget-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="029fbb93bdc1c0c5a7507b6076a6ec2f8d34204a85aa87e5b2f61a9405b290f5"
|
||||
LICENSE="GNU GPL v3"
|
||||
COPYRIGHT="1996-2014 Free Software Foundation"
|
||||
REVISION="2"
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86 x86_gcc2"
|
||||
|
||||
PROVIDES="
|
||||
wget$secondaryArchSuffix = $portVersion
|
||||
cmd:wget$secondaryArchSuffix = $portVersion
|
||||
"
|
||||
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libcrypto$secondaryArchSuffix
|
||||
lib:libssl$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
lib:libintl$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libcrypto$secondaryArchSuffix
|
||||
devel:libssl$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix >= 1.2.3
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:aclocal
|
||||
cmd:autoconf
|
||||
cmd:libtoolize
|
||||
cmd:make
|
||||
cmd:makeinfo
|
||||
cmd:pod2man
|
||||
cmd:gettext
|
||||
cmd:find
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
"
|
||||
|
||||
USER_SETTINGS_FILES="
|
||||
settings/wgetrc
|
||||
"
|
||||
|
||||
GLOBAL_WRITABLE_FILES="
|
||||
settings/wgetrc keep-old
|
||||
"
|
||||
|
||||
PATCHES="wget-$portVersion.patchset"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
AUTOPOINT=true autoreconf -fi
|
||||
runConfigure ./configure --with-ssl=openssl
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
# Tells wget where to find certificates
|
||||
echo "ca_certificate=/boot/system/data/ssl/CARootCertificates.pem" > $settingsDir/wgetrc
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
[ -d .git ] && mv .git .git-temp
|
||||
make check || true
|
||||
[ -d .git-temp ] && mv .git-temp .git
|
||||
}
|
||||
@@ -5,13 +5,13 @@ called from scripts."
|
||||
HOMEPAGE="https://www.gnu.org/software/wget/"
|
||||
COPYRIGHT="1996-2016 Free Software Foundation"
|
||||
LICENSE="GNU GPL v3"
|
||||
REVISION="1"
|
||||
REVISION="2"
|
||||
SOURCE_URI="http://ftpmirror.gnu.org/wget/wget-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="9e4f12da38cc6167d0752d934abe27c7b1599a9af294e73829be7ac7b5b4da40"
|
||||
PATCHES="wget-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="?x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="?x86 ?x86_gcc2"
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86 x86_gcc2"
|
||||
|
||||
PROVIDES="
|
||||
wget$secondaryArchSuffix = $portVersion
|
||||
|
||||
Reference in New Issue
Block a user