CVS commit: pkgsrc/lang

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Jan 25 15:17:41 UTC 2017

Modified Files:
        pkgsrc/lang/gcc5: Makefile
        pkgsrc/lang/gcc6: Makefile

Log Message:
Fix building on macOS: disable multilib (it requires fat-binaries); now builds without Command Line Tools.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/lang/gcc5/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc6/Makefile

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

Modified files:

Index: pkgsrc/lang/gcc5/Makefile
diff -u pkgsrc/lang/gcc5/Makefile:1.14 pkgsrc/lang/gcc5/Makefile:1.15
--- pkgsrc/lang/gcc5/Makefile:1.14      Thu Sep  8 09:55:32 2016
+++ pkgsrc/lang/gcc5/Makefile   Wed Jan 25 15:17:41 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2016/09/08 09:55:32 jperkin Exp $
+# $NetBSD: Makefile,v 1.15 2017/01/25 15:17:41 adam Exp $
 
 GCC_PKGNAME=           gcc5
 PKGREVISION=           2
@@ -91,6 +91,11 @@ CONFIGURE_ARGS+=     --enable-libssp
 CONFIGURE_ARGS+=       --enable-threads=posix
 CONFIGURE_ARGS+=       --with-boot-ldflags=${BOOT_LDFLAGS:Q}
 
+# multilib on Darwin requires fat-binaries
+CONFIGURE_ARGS.Darwin+=        --disable-multilib
+.if !empty(OSX_SDK_PATH)
+CONFIGURE_ARGS.Darwin+=        --with-sysroot=${OSX_SDK_PATH}
+.endif
 CONFIGURE_ARGS.NetBSD+=        --with-gnu-ld --with-ld=/usr/bin/ld
 CONFIGURE_ARGS.NetBSD+=        --with-gnu-as --with-as=/usr/bin/as
 MAKE_ENV.NetBSD+=      ac_cv_func_clock_gettime=yes

Index: pkgsrc/lang/gcc6/Makefile
diff -u pkgsrc/lang/gcc6/Makefile:1.1 pkgsrc/lang/gcc6/Makefile:1.2
--- pkgsrc/lang/gcc6/Makefile:1.1       Mon Sep 12 22:13:54 2016
+++ pkgsrc/lang/gcc6/Makefile   Wed Jan 25 15:17:41 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/09/12 22:13:54 maya Exp $
+# $NetBSD: Makefile,v 1.2 2017/01/25 15:17:41 adam Exp $
 
 GCC_PKGNAME=           gcc6
 .include               "version.mk"
@@ -90,6 +90,11 @@ CONFIGURE_ARGS+=     --enable-libssp
 CONFIGURE_ARGS+=       --enable-threads=posix
 CONFIGURE_ARGS+=       --with-boot-ldflags=${BOOT_LDFLAGS:Q}
 
+# multilib on Darwin requires fat-binaries
+CONFIGURE_ARGS.Darwin+=        --disable-multilib
+.if !empty(OSX_SDK_PATH)
+CONFIGURE_ARGS.Darwin+=        --with-sysroot=${OSX_SDK_PATH}
+.endif
 CONFIGURE_ARGS.NetBSD+=        --with-gnu-ld --with-ld=/usr/bin/ld
 CONFIGURE_ARGS.NetBSD+=        --with-gnu-as --with-as=/usr/bin/as
 MAKE_ENV.NetBSD+=      ac_cv_func_clock_gettime=yes