Import of pkgsrc-2016Q3

sysutils/coreutils/Makefile.common

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.11 2015/05/07 00:24:59 mef Exp $
+# $NetBSD: Makefile.common,v 1.15 2016/02/26 10:24:11 jperkin Exp $
 # used by sysutils/coreutils/Makefile
 # used by misc/gnuls/Makefile
 
-DISTNAME=	coreutils-8.23
+DISTNAME=	coreutils-8.25
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GNU:=coreutils/}
 EXTRACT_SUFX=	.tar.xz
@@ -35,22 +35,18 @@ TEST_TARGET=		check
 # Otherwise configure aborts when ran by root
 CONFIGURE_ENV+=		FORCE_UNSAFE_CONFIGURE=yes
 
-.if ${OPSYS} == "Interix"
-CONFIGURE_ENV+=		ac_list_mounted_fs=found
+CONFIGURE_ENV.Interix+=	ac_list_mounted_fs=found
+
+CONFIGURE_ENV.DragonFly+= 	gl_cv_search_pthread_join=-lpthread
+
+# Various tests rely on GCC's -O2 behaviour (e.g. -D__NO_INLINE__) and
+# without it we run into undefined symbol issues.
+.if ${OPSYS} == "Darwin" && ${PKGSRC_COMPILER} == "gcc"
+CFLAGS+=		-O2
 .endif
 
-.if ${OPSYS} == "DragonFly"
-CONFIGURE_ENV+= 	gl_cv_search_pthread_join=-lpthread
-.endif
-
-.if ${OPSYS} == "Linux"
-CONFIGURE_ENV+=		FORCE_UNSAFE_CONFIGURE=1
-.endif
-
-# Explicitly disable inotify support whilst it is Linux-specific.
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ENV+=		ac_cv_func_inotify_init=no
-.endif
+# Explicitly disable inotify support whilst it is Linux-specific.
+CONFIGURE_ENV.SunOS+=	ac_cv_func_inotify_init=no
 
 .if !empty(MACHINE_PLATFORM:MDarwin-[9].*-*)
 CONFIGURE_ENV+=		ac_cv_header_sys_acl_h=no jm_cv_func_svid_putenv=yes