CVS commit: pkgsrc/lang/ghc88

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Sep 16 17:26:31 UTC 2020

Modified Files:
        pkgsrc/lang/ghc88: distinfo
Added Files:
        pkgsrc/lang/ghc88/patches: patch-libraries_base_configure

Log Message:
ghc88: Ensure libiconv can be found at runtime.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/ghc88/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/ghc88/patches/patch-libraries_base_configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/ghc88/distinfo
diff -u pkgsrc/lang/ghc88/distinfo:1.12 pkgsrc/lang/ghc88/distinfo:1.13
--- pkgsrc/lang/ghc88/distinfo:1.12     Mon Aug 24 17:23:11 2020
+++ pkgsrc/lang/ghc88/distinfo  Wed Sep 16 17:26:31 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2020/08/24 17:23:11 pho Exp $
+$NetBSD: distinfo,v 1.13 2020/09/16 17:26:31 jperkin Exp $
 
 SHA1 (ghc-8.4.4-boot-i386-unknown-freebsd.tar.xz) = 04981802730423aa12999e59679be198d540222a
 RMD160 (ghc-8.4.4-boot-i386-unknown-freebsd.tar.xz) = f617e67f2c2f07c7211cb391a4bc2e7b304045e2
@@ -32,6 +32,7 @@ SHA1 (patch-libraries_Cabal_Cabal_Distri
 SHA1 (patch-libraries_base_GHC_Event_KQueue.hsc) = 8ee5da667a241a05fde3c580d3dc9bdc05aa5f00
 SHA1 (patch-libraries_base_System_CPUTime_Posix_Times.hsc) = 2bfb779d534d12073287274ce5e90b99e457a860
 SHA1 (patch-libraries_base_System_Environment.hs) = 7d79a91f295915b4408d5f41d5405739d7189215
+SHA1 (patch-libraries_base_configure) = f06a961a6507f635aafe50dab3ff4396c012bdec
 SHA1 (patch-libraries_time_lib_Data_Time_Clock_Internal_CTimespec.hsc) = 588270767f8a9cbde0648fc99807891fef65d721
 SHA1 (patch-libraries_time_lib_Data_Time_Clock_Internal_CTimeval.hs) = b2811ec4a845e6b2b44414e940b6108178b597c5
 SHA1 (patch-libraries_unix_System_Posix_Env.hsc) = e94936c139ca15d45cac4a7feb74a601567913ab

Added files:

Index: pkgsrc/lang/ghc88/patches/patch-libraries_base_configure
diff -u /dev/null pkgsrc/lang/ghc88/patches/patch-libraries_base_configure:1.1
--- /dev/null   Wed Sep 16 17:26:31 2020
+++ pkgsrc/lang/ghc88/patches/patch-libraries_base_configure    Wed Sep 16 17:26:31 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-libraries_base_configure,v 1.1 2020/09/16 17:26:31 jperkin Exp $
+
+Ensure libiconv can be found at runtime.
+
+--- libraries/base/configure.orig      2020-09-15 12:39:44.549328929 +0000
++++ libraries/base/configure
+@@ -4459,7 +4459,7 @@ fi
+ 
+ # Check whether --with-iconv-libraries was given.
+ if test "${with_iconv_libraries+set}" = set; then :
+-  withval=$with_iconv_libraries; ICONV_LIB_DIRS=$withval; LDFLAGS="-L$withval $LDFLAGS"
++  withval=$with_iconv_libraries; ICONV_LIB_DIRS=$withval; LDFLAGS="-L$withval ${COMPILER_RPATH_FLAG}$withval $LDFLAGS"
+ else
+   ICONV_LIB_DIRS=
+ fi