pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/binutils devel/binutils: Fix hard-coded libpath ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/241d7f5df0d3
branches:  trunk
changeset: 381060:241d7f5df0d3
user:      bacon <bacon%pkgsrc.org@localhost>
date:      Mon May 28 14:15:38 2018 +0000

description:
devel/binutils: Fix hard-coded libpath for RHEL

RHEL/CentOS place standard libraries in /lib64 and /usr/lib64.
The binutils Makefile had a hard-coded --libpath=/lib:/usr/lib.
This patch prepends the lib64 directories if they exist.

OK wiz@

diffstat:

 devel/binutils/Makefile |  13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r 6b06cb55d8c9 -r 241d7f5df0d3 devel/binutils/Makefile
--- a/devel/binutils/Makefile   Mon May 28 14:14:36 2018 +0000
+++ b/devel/binutils/Makefile   Mon May 28 14:15:38 2018 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.76 2017/08/16 19:59:50 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2018/05/28 14:15:38 bacon Exp $
 
 DISTNAME=      binutils-2.26.1
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GNU:=binutils/}
 
@@ -31,7 +32,15 @@
 .endif
 
 GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --with-lib-path='/lib:/usr/lib'
+# Standard lib dirs on RHEL are named *lib64
+LIB_PATH=       /lib:/usr/lib
+.if exists(/usr/lib64)
+LIB_PATH:=     /usr/lib64:${LIB_PATH}
+.endif
+.if exists(/lib64)
+LIB_PATH:=     /lib64:${LIB_PATH}
+.endif
+CONFIGURE_ARGS+=        --with-lib-path=${LIB_PATH}
 CONFIGURE_ARGS+=       --program-prefix=g
 BINUTILS_PREFIX=       ${PREFIX}/${MACHINE_GNU_PLATFORM}
 



Home | Main Index | Thread Index | Old Index