From 596125b476c625225c48abbcd8cfb91c4004dd7b Mon Sep 17 00:00:00 2001
From: sbd <sbd@pkgsrc.org>
Date: Sun, 24 Jun 2012 08:27:31 +0000
Subject: On Linux libieee can only appear once on the linker command line.

---
 lang/ocaml/distinfo         |  4 ++--
 lang/ocaml/patches/patch-at | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'lang/ocaml')

diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index 664d14df3e7..de289141ceb 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.62 2012/06/22 11:39:45 sbd Exp $
+$NetBSD: distinfo,v 1.63 2012/06/24 08:27:31 sbd Exp $
 
 SHA1 (ocaml-3.12.1.tar.bz2) = 29b44117b116b1a5bc54a8b4514af483793a769f
 RMD160 (ocaml-3.12.1.tar.bz2) = 61d38c0785491c8790ac02ab78fb2f26ea490fc1
@@ -11,7 +11,7 @@ SHA1 (patch-ag) = f1b751098d3693b92feb26cda87970426bffcaf1
 SHA1 (patch-ah) = 3165bbcdb98d09f5161912e51a3131486aa0b488
 SHA1 (patch-aj) = 6fd989f1e5dd1263890c14459dd4ab85d75e86cd
 SHA1 (patch-an) = 8fb8efecd2b3f0ec6f913a0840f4cfebcbb6161e
-SHA1 (patch-at) = 5925e7705e94ad3541d1ebbc568116e192ec50e5
+SHA1 (patch-at) = 14f2686bd1ac25e2b122cc9c39da60141a34f7f0
 SHA1 (patch-au) = 1e36bcdf39d40e781273ea51df213db05ff46c89
 SHA1 (patch-av) = f56c8924b81a620602bc5a67b0c4459b721701d2
 SHA1 (patch-aw) = cf66a2296cb86adfc0945e0009a6ed2805b57eed
diff --git a/lang/ocaml/patches/patch-at b/lang/ocaml/patches/patch-at
index 4e124fc6276..b7db6d5e10a 100644
--- a/lang/ocaml/patches/patch-at
+++ b/lang/ocaml/patches/patch-at
@@ -1,4 +1,4 @@
-$NetBSD: patch-at,v 1.27 2012/06/22 11:39:45 sbd Exp $
+$NetBSD: patch-at,v 1.28 2012/06/24 08:27:31 sbd Exp $
 
 . Include CFLAGS in bytecccompopts and LDFLAGS in bytecclinkopts.
 . Add cases for dragonfly support.
@@ -16,6 +16,7 @@ $NetBSD: patch-at,v 1.27 2012/06/22 11:39:45 sbd Exp $
 . Add pkgsrc X11 checks in case X11 support is enabled in the future
 . When linking with X11 add an rpath to X11 libdir.
 . Fix SunOS linker and as args
+. On Linux libieee can only appear once on the linker command line.
 
 --- configure.orig	2011-07-04 21:15:01.000000000 +0000
 +++ configure
@@ -227,3 +228,13 @@ $NetBSD: patch-at,v 1.27 2012/06/22 11:39:45 sbd Exp $
    fi
    otherlibraries="$otherlibraries dbm"
  fi
+@@ -1500,6 +1492,9 @@ if test $has_tk = true; then
+   fi
+ fi
+ 
++case "$host" in
++  *-*-linux*) tk_libs=`echo $tk_libs | sed -e's,-lieee,,'`;;
++esac
+ tkauxlibs="$mathlib $dllib"
+ tcllib=''
+ tklib=''
-- 
cgit v1.2.3