CVS commit: pkgsrc/devel/binutils

["Jason Bacon" <bacon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bacon
Date:           Mon May 28 14:15:38 UTC 2018

Modified Files:
        pkgsrc/devel/binutils: Makefile

Log Message:
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@


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 pkgsrc/devel/binutils/Makefile

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

Modified files:

Index: pkgsrc/devel/binutils/Makefile
diff -u pkgsrc/devel/binutils/Makefile:1.76 pkgsrc/devel/binutils/Makefile:1.77
--- pkgsrc/devel/binutils/Makefile:1.76 Wed Aug 16 19:59:50 2017
+++ pkgsrc/devel/binutils/Makefile      Mon May 28 14:15:38 2018
@@ -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 @@ CONFIG_SHELL=                ksh
 .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}