diff options
| author | joerg <joerg@pkgsrc.org> | 2015-12-26 11:58:19 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2015-12-26 11:58:19 +0000 |
| commit | 95f25268f86cfd6ea64503df62189e7cae57c518 (patch) | |
| tree | 946957f2a13ebd4b87f1abd0b8915eb423a7d916 /lang | |
| parent | 81ed452875c670f34e6ab365772583700c46d763 (diff) | |
| download | pkgsrc-95f25268f86cfd6ea64503df62189e7cae57c518.tar.gz | |
Fix readline detection.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/mercury/Makefile | 4 | ||||
| -rw-r--r-- | lang/mercury/distinfo | 4 | ||||
| -rw-r--r-- | lang/mercury/patches/patch-at | 19 |
3 files changed, 18 insertions, 9 deletions
diff --git a/lang/mercury/Makefile b/lang/mercury/Makefile index 6ddd587abe0..b0d4b4c62c8 100644 --- a/lang/mercury/Makefile +++ b/lang/mercury/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.57 2015/08/18 07:31:10 wiz Exp $ +# $NetBSD: Makefile,v 1.58 2015/12/26 11:58:19 joerg Exp $ DISTNAME= mercury-srcdist-14.01.1 PKGNAME= mercury-14.01.1 @@ -31,7 +31,7 @@ CONFIGURE_ENV+= CC=gcc CONFIGURE_ENV+= HOSTNAMECMD=${TOOLS_HOSTNAME_CMD:Q} USE_TOOLS+= hostname -MAKE_ENV+= READLINE_PREFIX=${BUILDLINK_PREFIX.readline} +ALL_ENV+= READLINE_PREFIX=${BUILDLINK_PREFIX.readline} INSTALL_PREFIX= ${WRKSRC}/tmp BUILD_MAKE_FLAGS= ${MAKE_FLAGS} diff --git a/lang/mercury/distinfo b/lang/mercury/distinfo index 10714680d1b..6e14bb372ae 100644 --- a/lang/mercury/distinfo +++ b/lang/mercury/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2015/11/03 22:50:38 agc Exp $ +$NetBSD: distinfo,v 1.16 2015/12/26 11:58:19 joerg Exp $ SHA1 (mercury-srcdist-14.01.1.tar.gz) = 8d8295aed6cadb6cd2e932490042de6075d18acf RMD160 (mercury-srcdist-14.01.1.tar.gz) = 8ee4a5ee694985b6d6453bee86a3a7e12cc9d0ac @@ -11,4 +11,4 @@ SHA1 (patch-an) = 65bfb05147fe2f3663b35e494b8e8bf7fc6906e2 SHA1 (patch-ao) = c994597a95edc8376c4916333e7ad371752bbd2e SHA1 (patch-ap) = 1779d182c543322c0083a6cca354a73fda4f7cb5 SHA1 (patch-aq) = fcf7b99650d9f288cbc4200c2bc48934f7198845 -SHA1 (patch-at) = 41173e0ea5bffe06f8bcffb85cd8447831c3c044 +SHA1 (patch-at) = fc77b1e0059a7eb98e5d9c9fb30b69434fcf475c diff --git a/lang/mercury/patches/patch-at b/lang/mercury/patches/patch-at index fb2bfbd2d60..c02c8c48852 100644 --- a/lang/mercury/patches/patch-at +++ b/lang/mercury/patches/patch-at @@ -1,11 +1,11 @@ -$NetBSD: patch-at,v 1.4 2015/07/30 19:34:40 asau Exp $ +$NetBSD: patch-at,v 1.5 2015/12/26 11:58:19 joerg Exp $ Support shared libraries. Don't capture value of HOME. ---- configure.orig 2014-09-08 08:56:03.000000000 +0400 -+++ configure 2015-07-30 22:18:33.000000000 +0300 -@@ -1514,7 +1514,7 @@ +--- configure.orig 2014-09-08 04:56:03.000000000 +0000 ++++ configure +@@ -1514,7 +1514,7 @@ Installation directories: By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify an installation prefix other than \`$ac_default_prefix' using \`--prefix', @@ -14,7 +14,7 @@ Don't capture value of HOME. For better control, use the options below. -@@ -11481,7 +11481,7 @@ +@@ -11481,7 +11481,7 @@ $as_echo "yes" >&6; } EXT_FOR_SHARED_LIB=so EXT_FOR_LINK_WITH_PIC_OBJECTS=o ;; @@ -23,3 +23,12 @@ Don't capture value of HOME. # From Cornelis van der Laan <nils@ims.uni-stuttgart.de> { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +@@ -13143,7 +13143,7 @@ if test $mercury_cv_have_readline = no; + + else + TERMCAP_LIBRARY="$mercury_cv_termcap_lib" +- READLINE_LIBRARIES="-lreadline $TERMCAP_LIBRARY" ++ READLINE_LIBRARIES="-L${READLINE_PREFIX}/lib ${LINKER_RPATH_FLAG}${READLINE_PREFIX}/lib -lreadline $TERMCAP_LIBRARY" + fi + + |