diff options
| author | jperkin <jperkin> | 2016-02-26 10:24:10 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2016-02-26 10:24:10 +0000 |
| commit | ef1610895821955af5f984f84fd7ebd4d703c080 (patch) | |
| tree | 0296198370532d82efd6efd523c7ca1570359f37 /sysutils/coreutils | |
| parent | de37916b80b2468bc4a685bb71738de502b3f2bc (diff) | |
| download | pkgsrc-ef1610895821955af5f984f84fd7ebd4d703c080.tar.gz | |
Use OPSYSVARS.
Diffstat (limited to 'sysutils/coreutils')
| -rw-r--r-- | sysutils/coreutils/Makefile | 6 | ||||
| -rw-r--r-- | sysutils/coreutils/Makefile.common | 14 |
2 files changed, 6 insertions, 14 deletions
diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile index fa745a54315..0fdb239ec2b 100644 --- a/sysutils/coreutils/Makefile +++ b/sysutils/coreutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.69 2016/01/31 09:20:50 ryoon Exp $ +# $NetBSD: Makefile,v 1.70 2016/02/26 10:24:11 jperkin Exp $ .include "../../sysutils/coreutils/Makefile.common" @@ -35,12 +35,10 @@ PLIST.stdbuf= yes # Ensure libstdbuf.so has a valid library name otherwise REQUIRES will # record the relative path of the object output file. -.if ${OPSYS} == "Darwin" -SUBST_CLASSES+= libname +SUBST_CLASSES.Darwin+= libname SUBST_STAGE.libname= pre-configure SUBST_FILES.libname= Makefile.in SUBST_SED.libname= -e '/^src_libstdbuf_so_LDFLAGS/s,$$, -install_name ${PREFIX}/libexec/coreutils/glibstdbuf.so,' -.endif PROGS= [ base64 basename cat chcon chgrp chmod chown chroot cksum comm \ cp csplit cut date dd df dir dircolors dirname du hostid echo env \ diff --git a/sysutils/coreutils/Makefile.common b/sysutils/coreutils/Makefile.common index ea0723e739c..b23bf14edbc 100644 --- a/sysutils/coreutils/Makefile.common +++ b/sysutils/coreutils/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.14 2016/02/16 11:54:12 jperkin 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 @@ -35,13 +35,9 @@ 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 -.endif +CONFIGURE_ENV.Interix+= ac_list_mounted_fs=found -.if ${OPSYS} == "DragonFly" -CONFIGURE_ENV+= gl_cv_search_pthread_join=-lpthread -.endif +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. @@ -50,9 +46,7 @@ CFLAGS+= -O2 .endif # Explicitly disable inotify support whilst it is Linux-specific. -.if ${OPSYS} == "SunOS" -CONFIGURE_ENV+= ac_cv_func_inotify_init=no -.endif +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 |