From cdb2a41d525d0cbb9211b243771d2b1d519fdfbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
Date: Tue, 20 Dec 2016 21:36:00 +0100
Subject: [PATCH] links: fix x86_64 build.

---
 www-client/links/links-2.8.recipe        | 8 ++++++--
 www-client/links/patches/links-2.8.patch | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/www-client/links/links-2.8.recipe b/www-client/links/links-2.8.recipe
index 99c5594b4..7798f3b22 100644
--- a/www-client/links/links-2.8.recipe
+++ b/www-client/links/links-2.8.recipe
@@ -4,7 +4,7 @@ HOMEPAGE="http://links.twibright.com/"
 COPYRIGHT="1999 - 2011 Mikulas Patocka
 	2000 - 2011 Petr Kulhavy, Karel Kulhavy, Martin Pergel"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="http://links.twibright.com/download/links-2.8.tar.gz"
 CHECKSUM_SHA256="5070a759af7f107ca4f9572833b8f086cd9f7c21ef5e1fce8482a2883a743c7a"
 PATCHES="links-2.8.patch"
@@ -47,6 +47,10 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
+	STDCPPLIBS=-lstdc++
+	if [ "$targetArchitecture" = x86_gcc2 ]; then
+		STDCPPLIBS=-lstdc++.r4
+	fi
 	aclocal
 	automake --add-missing
 	autoheader
@@ -55,7 +59,7 @@ BUILD()
 	runConfigure ./configure \
 		--without-x \
 		--enable-graphics
-	make
+	make STDCPPLIBS=$STDCPPLIBS
 }
 
 INSTALL()
diff --git a/www-client/links/patches/links-2.8.patch b/www-client/links/patches/links-2.8.patch
index c548ab300..8fc7795d9 100644
--- a/www-client/links/patches/links-2.8.patch
+++ b/www-client/links/patches/links-2.8.patch
@@ -299,7 +299,7 @@ diff -urN links-2.8.org/haiku.cpp links-2.8/haiku.cpp
 +	//	return;
 +	BMessenger msgr(WindowAt(0));
 +	BMessage *m = new BMessage(*message);
-+	m->AddSpecifier("View", (long)0);
++	m->AddSpecifier("View", (int32)0);
 +	//m->what = B_SIMPLE_DATA;
 +	if (msgr.IsValid()) {
 +		msgr.SendMessage(m);
@@ -1177,7 +1177,7 @@ diff -urN links-2.8.org/Makefile.am links-2.8/Makefile.am
  endif
  
 +if HAIKU_GR
-+links_LDADD=haiku.o -lbe
++links_LDADD=haiku.o -lbe $(STDCPPLIBS)
 +EXTRA_links_DEPENDENCIES=links-haiku.rsrc
 +# automake will not let us touch the binary after link
 +# and install will not copy the attributes anyway... so do it after install