diff options
Diffstat (limited to 'lang')
32 files changed, 128 insertions, 125 deletions
diff --git a/lang/gcc-aux/buildlink3.mk b/lang/gcc-aux/buildlink3.mk index f7c1ccfa361..da7f5cfe7e2 100644 --- a/lang/gcc-aux/buildlink3.mk +++ b/lang/gcc-aux/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.4 2014/04/30 16:24:39 marino Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:18 rillig Exp $ -BUILDLINK_TREE+= gcc-aux +BUILDLINK_TREE+= gcc-aux .if !defined(GCC_AUX_BUILDLINK3_MK) GCC_AUX_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.gcc-aux+= gcc-aux>=20140422 -BUILDLINK_PKGSRCDIR.gcc-aux?= ../../lang/gcc-aux +BUILDLINK_API_DEPENDS.gcc-aux+= gcc-aux>=20140422 +BUILDLINK_PKGSRCDIR.gcc-aux?= ../../lang/gcc-aux .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gmp/buildlink3.mk" @@ -21,4 +21,4 @@ pkgbase := gcc-aux .endif .endif -BUILDLINK_TREE+= -gcc-aux +BUILDLINK_TREE+= -gcc-aux diff --git a/lang/gcc2/buildlink3.mk b/lang/gcc2/buildlink3.mk index dbb19759d01..7c11b2378c2 100644 --- a/lang/gcc2/buildlink3.mk +++ b/lang/gcc2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2015/04/25 10:32:07 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:18 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -15,11 +15,11 @@ BUILDLINK_LIBDIRS.gcc2?= \ ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc2}\///} # Packages that link against shared libraries need a full dependency. -. if defined(_USE_GCC_SHLIB) +.if defined(_USE_GCC_SHLIB) BUILDLINK_DEPMETHOD.gcc2+= full -. else +.else BUILDLINK_DEPMETHOD.gcc2?= build -. endif +.endif .endif # GCC2_BUILDLINK3_MK BUILDLINK_TREE+= -gcc2 diff --git a/lang/gcc3-c++/buildlink3.mk b/lang/gcc3-c++/buildlink3.mk index b4b391ce825..400791e1333 100644 --- a/lang/gcc3-c++/buildlink3.mk +++ b/lang/gcc3-c++/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.20 2014/09/06 08:20:28 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2018/01/07 13:04:18 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -7,23 +7,23 @@ BUILDLINK_TREE+= gcc3-cxx .if !defined(GCC3_CXX_BUILDLINK3_MK) GCC3_CXX_BUILDLINK3_MK:= -. if defined(GCC3_INSTALLTO_SUBPREFIX) -. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" -GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} -. endif +.if defined(GCC3_INSTALLTO_SUBPREFIX) +. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" +GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} . endif +.endif BUILDLINK_API_DEPENDS.gcc3-cxx+= gcc3${GCC3_PKGMODIF}-c++>=3.0 BUILDLINK_ABI_DEPENDS.gcc3-cxx+= gcc3-c++>=3.3.5nb1 -BUILDLINK_PKGSRCDIR.gcc3-cxx?= ../../lang/gcc3-c++ +BUILDLINK_PKGSRCDIR.gcc3-cxx?= ../../lang/gcc3-c++ BUILDLINK_LIBDIRS.gcc3-cxx?= \ lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-cxx}\///} # Packages that link against shared libraries need a full dependency. -. if defined(_USE_GCC_SHLIB) +.if defined(_USE_GCC_SHLIB) BUILDLINK_DEPMETHOD.gcc3-cxx+= full -. else +.else BUILDLINK_DEPMETHOD.gcc3-cxx?= build -. endif +.endif .endif # GCC3_CXX_BUILDLINK3_MK BUILDLINK_TREE+= -gcc3-cxx diff --git a/lang/gcc3-c/buildlink3.mk b/lang/gcc3-c/buildlink3.mk index b27200ec848..dc63932b5f9 100644 --- a/lang/gcc3-c/buildlink3.mk +++ b/lang/gcc3-c/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.19 2014/09/06 08:20:29 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2018/01/07 13:04:18 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -7,34 +7,34 @@ BUILDLINK_TREE+= gcc3-c .if !defined(GCC3_C_BUILDLINK3_MK) GCC3_C_BUILDLINK3_MK:= -. include "../../mk/bsd.prefs.mk" -. if defined(GCC3_INSTALLTO_SUBPREFIX) +.include "../../mk/bsd.prefs.mk" +.if defined(GCC3_INSTALLTO_SUBPREFIX) # # "gcc3" is the directory named in pkgsrc/lang/gcc3-c/Makefile.common" # as GCC3_DEFAULT_SUBPREFIX. # -. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" +. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} -. endif . endif +.endif BUILDLINK_API_DEPENDS.gcc3-c+= gcc3${GCC3_PKGMODIF}-c>=3.0 BUILDLINK_ABI_DEPENDS.gcc3-c+= gcc3-c>=3.3.5nb1 BUILDLINK_PKGSRCDIR.gcc3-c?= ../../lang/gcc3-c BUILDLINK_GCC3_LIBDIRS= lib -. if defined(GCC3_INSTALLTO_SUBPREFIX) +.if defined(GCC3_INSTALLTO_SUBPREFIX) BUILDLINK_GCC3_LIBDIRS+= ${GCC3_INSTALLTO_SUBPREFIX}/lib -. else +.else BUILDLINK_GCC3_LIBDIRS+= gcc3/lib -. endif +.endif BUILDLINK_GCC3_LIBDIRS+= ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-c}\///} BUILDLINK_LIBDIRS.gcc3-c+= ${BUILDLINK_GCC3_LIBDIRS} # Packages that link against shared libraries need a full dependency. -. if defined(_USE_GCC_SHLIB) +.if defined(_USE_GCC_SHLIB) BUILDLINK_DEPMETHOD.gcc3-c+= full -. else +.else BUILDLINK_DEPMETHOD.gcc3-c?= build -. endif +.endif .endif # GCC3_C_BUILDLINK3_MK BUILDLINK_TREE+= -gcc3-c diff --git a/lang/gcc3-f77/buildlink3.mk b/lang/gcc3-f77/buildlink3.mk index 6bf5861f397..89436ce8a35 100644 --- a/lang/gcc3-f77/buildlink3.mk +++ b/lang/gcc3-f77/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.20 2014/09/06 08:20:29 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2018/01/07 13:04:18 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -7,23 +7,23 @@ BUILDLINK_TREE+= gcc3-f77 .if !defined(GCC3_F77_BUILDLINK3_MK) GCC3_F77_BUILDLINK3_MK:= -. if defined(GCC3_INSTALLTO_SUBPREFIX) -. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" -GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} -. endif +.if defined(GCC3_INSTALLTO_SUBPREFIX) +. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" +GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} . endif +.endif BUILDLINK_API_DEPENDS.gcc3-f77+= gcc3${GCC3_PKGMODIF}-f77>=3.0 BUILDLINK_ABI_DEPENDS.gcc3-f77+= gcc3-f77>=3.3.5nb2 -BUILDLINK_PKGSRCDIR.gcc3-f77?= ../../lang/gcc3-f77 +BUILDLINK_PKGSRCDIR.gcc3-f77?= ../../lang/gcc3-f77 BUILDLINK_LIBDIRS.gcc3-f77?= \ lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-f77}\///} # Packages that link against shared libraries need a full dependency. -. if defined(_USE_GCC_SHLIB) +.if defined(_USE_GCC_SHLIB) BUILDLINK_DEPMETHOD.gcc3-f77+= full -. else +.else BUILDLINK_DEPMETHOD.gcc3-f77?= build -. endif +.endif .endif # GCC3_F77_BUILDLINK3_MK BUILDLINK_TREE+= -gcc3-f77 diff --git a/lang/gcc3-objc/buildlink3.mk b/lang/gcc3-objc/buildlink3.mk index 6ed138bcfe3..d415685cd2b 100644 --- a/lang/gcc3-objc/buildlink3.mk +++ b/lang/gcc3-objc/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.20 2014/09/06 08:20:29 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2018/01/07 13:04:18 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -7,23 +7,23 @@ BUILDLINK_TREE+= gcc3-objc .if !defined(GCC3_OBJC_BUILDLINK3_MK) GCC3_OBJC_BUILDLINK3_MK:= -. if defined(GCC3_INSTALLTO_SUBPREFIX) -. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" -GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} -. endif +.if defined(GCC3_INSTALLTO_SUBPREFIX) +. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" +GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} . endif +.endif BUILDLINK_API_DEPENDS.gcc3-objc+= gcc3${GCC3_PKGMODIF}-objc>=3.0 BUILDLINK_ABI_DEPENDS.gcc3-objc+= gcc3-objc>=3.3.5nb1 -BUILDLINK_PKGSRCDIR.gcc3-objc?= ../../lang/gcc3-objc +BUILDLINK_PKGSRCDIR.gcc3-objc?= ../../lang/gcc3-objc BUILDLINK_LIBDIRS.gcc3-objc?= \ lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-objc}\///} # Packages that link against shared libraries need a full dependency. -. if defined(_USE_GCC_SHLIB) +.if defined(_USE_GCC_SHLIB) BUILDLINK_DEPMETHOD.gcc3-objc+= full -. else +.else BUILDLINK_DEPMETHOD.gcc3-objc?= build -. endif +.endif .endif # GCC3_OBJC_BUILDLINK3_MK BUILDLINK_TREE+= -gcc3-objc diff --git a/lang/gcc34/buildlink3.mk b/lang/gcc34/buildlink3.mk index 13903279d74..8c779371b82 100644 --- a/lang/gcc34/buildlink3.mk +++ b/lang/gcc34/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.23 2015/11/25 12:51:16 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.24 2018/01/07 13:04:18 rillig Exp $ BUILDLINK_TREE+= gcc34 @@ -12,12 +12,12 @@ BUILDLINK_API_DEPENDS.gcc34+= gcc34>=3.4 BUILDLINK_ABI_DEPENDS.gcc34+= gcc34>=3.4.6nb4 BUILDLINK_PKGSRCDIR.gcc34?= ../../lang/gcc34 -. if exists(${_GCC34_PREFIX}/bin/gcc) +.if exists(${_GCC34_PREFIX}/bin/gcc) # logic for detecting the ADA compiler -gcc34_GNAT1!=${_GCC34_PREFIX}/bin/gcc -print-prog-name=gnat1 -. if exists(${gcc34_GNAT1}) +gcc34_GNAT1!= ${_GCC34_PREFIX}/bin/gcc -print-prog-name=gnat1 +. if exists(${gcc34_GNAT1}) BUILDLINK_ENV+= ADAC=${_GCC34_PREFIX}/bin/gcc -. endif +. endif # add libraries BUILDLINK_LIBDIRS.gcc34+= ${_GCC34_SUBDIR}/lib @@ -26,18 +26,18 @@ BUILDLINK_LIBDIRS.gcc34+= ${_GCC34_SUBDIR}/lib gcc34_GCC_ARCHDIR!= ${DIRNAME} `${_GCC34_PREFIX}/bin/gcc --print-libgcc-file-name` # add the architecture dep libraries -. if empty(gcc34_GCC_ARCHDIR:M*not_found*) +. if empty(gcc34_GCC_ARCHDIR:M*not_found*) BUILDLINK_LIBDIRS.gcc34+= ${gcc34_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc34}\///}/ # add the ada libraries -. if exists(${gcc34_GNAT1}) +. if exists(${gcc34_GNAT1}) BUILDLINK_LIBDIRS.gcc34+= ${gcc34_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc34}\///}/adalib -. endif +. endif # add the header files BUILDLINK_INCDIRS.gcc34+= ${_GCC34_SUBDIR}/include ${gcc34_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc34}\///}/include -. endif . endif +.endif BUILDLINK_FILES_CMD.gcc34= \ (cd ${BUILDLINK_PREFIX.gcc34} && \ @@ -52,11 +52,11 @@ _USE_GCC_SHLIB= yes .endif # Packages that link against shared libraries need a full dependency. -. if defined(_USE_GCC_SHLIB) +.if defined(_USE_GCC_SHLIB) BUILDLINK_DEPMETHOD.gcc34+= full -. else +.else BUILDLINK_DEPMETHOD.gcc34?= build -. endif +.endif .include "../../mk/pthread.buildlink3.mk" pkgbase := gcc34 diff --git a/lang/gcc49/buildlink3.mk b/lang/gcc49/buildlink3.mk index 1573d18af4b..3d3fd0d7211 100644 --- a/lang/gcc49/buildlink3.mk +++ b/lang/gcc49/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2015/11/25 12:51:17 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:18 rillig Exp $ BUILDLINK_TREE+= gcc49 @@ -29,4 +29,5 @@ pkgbase := gcc49 .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .endif # GCC49_BUILDLINK3_MK + BUILDLINK_TREE+= -gcc49 diff --git a/lang/gcc5-aux/buildlink3.mk b/lang/gcc5-aux/buildlink3.mk index bed464c2204..e6e35781a0e 100644 --- a/lang/gcc5-aux/buildlink3.mk +++ b/lang/gcc5-aux/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.2 2016/11/26 18:23:25 marino Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:18 rillig Exp $ -BUILDLINK_TREE+= gcc5-aux +BUILDLINK_TREE+= gcc5-aux .if !defined(GCC5_AUX_BUILDLINK3_MK) GCC5_AUX_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gcc5-aux+= gcc5-aux>=20150422 -BUILDLINK_PKGSRCDIR.gcc5-aux?= ../../lang/gcc5-aux +BUILDLINK_PKGSRCDIR.gcc5-aux?= ../../lang/gcc5-aux BUILDLINK_DEPMETHOD.gcc5-aux?= build .include "../../converters/libiconv/buildlink3.mk" @@ -19,4 +19,4 @@ pkgbase := gcc5-aux .endif -BUILDLINK_TREE+= -gcc5-aux +BUILDLINK_TREE+= -gcc5-aux diff --git a/lang/gcc5-libs/buildlink3.mk b/lang/gcc5-libs/buildlink3.mk index 7efa8209053..78aa5aa4a54 100644 --- a/lang/gcc5-libs/buildlink3.mk +++ b/lang/gcc5-libs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2018/01/01 18:16:37 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:19 rillig Exp $ BUILDLINK_TREE+= gcc5-libs @@ -11,7 +11,7 @@ BUILDLINK_API_DEPENDS.gcc5-libs+= gcc5-libs>=5.1.0 BUILDLINK_API_DEPENDS.gcc5-libs+= {gcc5,gcc5-libs}>=5.1.0 .endif BUILDLINK_PKGSRCDIR.gcc5-libs= ../../lang/gcc5-libs -BUILDLINK_DEPMETHOD.gcc5-libs?= full +BUILDLINK_DEPMETHOD.gcc5-libs?= full BUILDLINK_PASSTHRU_DIRS+= ${BUILDLINK_PREFIX.gcc5-libs}/gcc5 diff --git a/lang/gcc5/buildlink3.mk b/lang/gcc5/buildlink3.mk index 8bf39153573..73b8163f020 100644 --- a/lang/gcc5/buildlink3.mk +++ b/lang/gcc5/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2015/11/25 12:51:17 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:18 rillig Exp $ BUILDLINK_TREE+= gcc5 @@ -30,4 +30,5 @@ pkgbase := gcc5 .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .endif # GCC5_BUILDLINK3_MK + BUILDLINK_TREE+= -gcc5 diff --git a/lang/gcc6-aux/buildlink3.mk b/lang/gcc6-aux/buildlink3.mk index ed5119704cc..a13f4e55862 100644 --- a/lang/gcc6-aux/buildlink3.mk +++ b/lang/gcc6-aux/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1 2016/12/13 01:19:20 marino Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:19 rillig Exp $ -BUILDLINK_TREE+= gcc6-aux +BUILDLINK_TREE+= gcc6-aux .if !defined(GCC5_AUX_BUILDLINK3_MK) GCC5_AUX_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gcc6-aux+= gcc6-aux>=20160822 -BUILDLINK_PKGSRCDIR.gcc6-aux?= ../../lang/gcc6-aux +BUILDLINK_PKGSRCDIR.gcc6-aux?= ../../lang/gcc6-aux BUILDLINK_DEPMETHOD.gcc6-aux?= build .include "../../converters/libiconv/buildlink3.mk" @@ -19,4 +19,4 @@ pkgbase := gcc6-aux .endif -BUILDLINK_TREE+= -gcc6-aux +BUILDLINK_TREE+= -gcc6-aux diff --git a/lang/gcc6-libs/buildlink3.mk b/lang/gcc6-libs/buildlink3.mk index f7808b8b772..cb2e4a80529 100644 --- a/lang/gcc6-libs/buildlink3.mk +++ b/lang/gcc6-libs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2018/01/01 18:16:37 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:19 rillig Exp $ BUILDLINK_TREE+= gcc6-libs @@ -11,7 +11,7 @@ BUILDLINK_API_DEPENDS.gcc6-libs+= gcc6-libs>=6.1.0 BUILDLINK_API_DEPENDS.gcc6-libs+= {gcc6,gcc6-libs}>=6.1.0 .endif BUILDLINK_PKGSRCDIR.gcc6-libs= ../../lang/gcc6-libs -BUILDLINK_DEPMETHOD.gcc6-libs?= full +BUILDLINK_DEPMETHOD.gcc6-libs?= full BUILDLINK_PASSTHRU_DIRS+= ${BUILDLINK_PREFIX.gcc6-libs}/gcc6 diff --git a/lang/gcc6/buildlink3.mk b/lang/gcc6/buildlink3.mk index 4dcc31c3cc2..74df7a1155b 100644 --- a/lang/gcc6/buildlink3.mk +++ b/lang/gcc6/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2016/09/12 22:13:54 maya Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:19 rillig Exp $ BUILDLINK_TREE+= gcc6 @@ -28,4 +28,5 @@ pkgbase := gcc6 .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .endif # GCC6_BUILDLINK3_MK + BUILDLINK_TREE+= -gcc6 diff --git a/lang/gnat_util/buildlink3.mk b/lang/gnat_util/buildlink3.mk index d7493766f5f..002ac376f05 100644 --- a/lang/gnat_util/buildlink3.mk +++ b/lang/gnat_util/buildlink3.mk @@ -1,13 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.1 2014/04/30 16:25:20 marino Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:19 rillig Exp $ -BUILDLINK_TREE+= gnat_util +BUILDLINK_TREE+= gnat_util .if !defined(GNAT_UTIL_BUILDLINK3_MK) GNAT_UTIL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gnat_util+= gnat_util>=20140422 -BUILDLINK_PKGSRCDIR.gnat_util?= ../../lang/gnat_util +BUILDLINK_PKGSRCDIR.gnat_util?= ../../lang/gnat_util .endif -BUILDLINK_TREE+= -gnat_util +BUILDLINK_TREE+= -gnat_util diff --git a/lang/libLLVM34/buildlink3.mk b/lang/libLLVM34/buildlink3.mk index 28514aaab1f..f35635cb5ef 100644 --- a/lang/libLLVM34/buildlink3.mk +++ b/lang/libLLVM34/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2015/04/06 17:25:05 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:19 rillig Exp $ BUILDLINK_TREE+= libLLVM34 @@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.libLLVM34+= libLLVM34>=3.4.2nb1 BUILDLINK_PKGSRCDIR.libLLVM34?= ../../lang/libLLVM34 BUILDLINK_INCDIRS.libLLVM34?= include/libLLVM34 BUILDLINK_LIBDIRS.libLLVM34?= lib/libLLVM34 -LLVM_CONFIG_PATH?= ${BUILDLINK_PREFIX.libLLVM34}/libexec/libLLVM34/llvm-config +LLVM_CONFIG_PATH?= ${BUILDLINK_PREFIX.libLLVM34}/libexec/libLLVM34/llvm-config .endif # LIBLLVM34_BUILDLINK3_MK diff --git a/lang/libunwind/buildlink3.mk b/lang/libunwind/buildlink3.mk index 203e960af34..6f32a42b4f5 100644 --- a/lang/libunwind/buildlink3.mk +++ b/lang/libunwind/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2017/07/11 19:47:37 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:19 rillig Exp $ BUILDLINK_TREE+= libunwind @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libunwind LIBUNWIND_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libunwind+= libunwind>=4.0.1 -BUILDLINK_PKGSRCDIR.libunwind?= ../../lang/libunwind +BUILDLINK_PKGSRCDIR.libunwind?= ../../lang/libunwind .include "../../lang/llvm/buildlink3.mk" .endif # LIBUNWIND_BUILDLINK3_MK diff --git a/lang/llvm/buildlink3.mk b/lang/llvm/buildlink3.mk index fbc758b5443..c2c22bf9fa5 100644 --- a/lang/llvm/buildlink3.mk +++ b/lang/llvm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2017/07/11 19:47:37 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:19 rillig Exp $ BUILDLINK_TREE+= llvm @@ -12,9 +12,9 @@ LLVM_CONFIG_PATH?= ${BUILDLINK_PREFIX.llvm}/bin/llvm-config pkgbase := llvm .include "../../mk/pkg-build-options.mk" -. if !empty(PKG_BUILD_OPTIONS.llvm:Mterminfo) +.if !empty(PKG_BUILD_OPTIONS.llvm:Mterminfo) .include "../../mk/terminfo.buildlink3.mk" -. endif +.endif .include "../../devel/zlib/buildlink3.mk" .endif # LLVM_BUILDLINK3_MK diff --git a/lang/lua/buildlink3.mk b/lang/lua/buildlink3.mk index b4779513b31..9a0566960f2 100644 --- a/lang/lua/buildlink3.mk +++ b/lang/lua/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2015/07/20 11:30:54 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2018/01/07 13:04:19 rillig Exp $ # # This is a fake buildlink3.mk file. It figures out the Lua version # and then includes the real buildlink3.mk file for that Lua version. @@ -14,7 +14,7 @@ BUILDLINK_PREFIX.lua= ${BUILDLINK_PREFIX.${LUA_PACKAGE}} .if !defined(LUA_BUILDLINK3_MK) LUA_BUILDLINK3_MK:= -BUILDLINK_TARGETS+= buildlink-bin-unversioned +BUILDLINK_TARGETS+= buildlink-bin-unversioned buildlink-bin-unversioned: ${LN} -s ${BUILDLINK_DIR}/lib/pkgconfig/lua-${_LUA_DOT_VERSION}.pc ${BUILDLINK_DIR}/lib/pkgconfig/lua.pc diff --git a/lang/mono/buildlink3.mk b/lang/mono/buildlink3.mk index 56f796577f1..629ee532fdb 100644 --- a/lang/mono/buildlink3.mk +++ b/lang/mono/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.57 2017/11/30 16:45:04 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.58 2018/01/07 13:04:19 rillig Exp $ BUILDLINK_TREE+= mono @@ -8,7 +8,7 @@ MONO_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.mono+= mono>=4 BUILDLINK_ABI_DEPENDS.mono?= mono>=4.0.4.1nb9 BUILDLINK_PKGSRCDIR.mono?= ../../lang/mono -ALL_ENV+= MONO_SHARED_DIR=${WRKDIR:Q} +ALL_ENV+= MONO_SHARED_DIR=${WRKDIR} BUILDLINK_CONTENTS_FILTER.mono= ${EGREP} '(^include/|^lib/)' .include "../../textproc/icu/buildlink3.mk" diff --git a/lang/mono2/buildlink3.mk b/lang/mono2/buildlink3.mk index 2385923a910..36aabd9a812 100644 --- a/lang/mono2/buildlink3.mk +++ b/lang/mono2/buildlink3.mk @@ -1,14 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.10 2017/11/30 16:45:04 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:19 rillig Exp $ BUILDLINK_TREE+= mono .if !defined(MONO_BUILDLINK3_MK) MONO_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.mono+= mono>=2.8<3 -BUILDLINK_ABI_DEPENDS.mono+= mono>=2.10.9nb22 -BUILDLINK_PKGSRCDIR.mono?= ../../lang/mono2 -ALL_ENV+= MONO_SHARED_DIR=${WRKDIR:Q} +BUILDLINK_API_DEPENDS.mono+= mono>=2.8<3 +BUILDLINK_ABI_DEPENDS.mono+= mono>=2.10.9nb22 +BUILDLINK_PKGSRCDIR.mono?= ../../lang/mono2 +ALL_ENV+= MONO_SHARED_DIR=${WRKDIR} BUILDLINK_CONTENTS_FILTER.mono+= ${EGREP} '(^include/|^lib/)' .include "../../textproc/icu/buildlink3.mk" diff --git a/lang/ocaml/buildlink3.mk b/lang/ocaml/buildlink3.mk index 7cdb9f4dc80..f7fc419280a 100644 --- a/lang/ocaml/buildlink3.mk +++ b/lang/ocaml/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.41 2017/09/08 09:12:44 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.42 2018/01/07 13:04:20 rillig Exp $ BUILDLINK_TREE+= ocaml @@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.ocaml+= ocaml>=4.05.0 BUILDLINK_PKGSRCDIR.ocaml?= ../../lang/ocaml #BUILDLINK_DEPMETHOD.ocaml?= build -BUILDLINK_PASSTHRU_DIRS+= ${BUILDLINK_PREFIX.ocaml}/lib/ocaml +BUILDLINK_PASSTHRU_DIRS+= ${BUILDLINK_PREFIX.ocaml}/lib/ocaml BUILDLINK_TARGETS+= ocaml-wrappers OCAML_WRAPPERS= ocamlc ocamlc.opt ocamlcp ocamlmklib ocamlmktop \ @@ -23,8 +23,8 @@ ocaml-wrappers: for w in ${OCAML_WRAPPERS}; do \ ${SED} -e 's|@SH@|'${SH:Q}'|g' \ -e 's|@OCAML_PREFIX@|${BUILDLINK_PREFIX.ocaml}|g' \ - -e 's|@CFLAGS@|'${CFLAGS:Q}'|g' \ - -e 's|@LDFLAGS@|'${LDFLAGS:Q}'|g' \ + -e 's|@CFLAGS@|'${CFLAGS:M*:Q}'|g' \ + -e 's|@LDFLAGS@|'${LDFLAGS:M*:Q}'|g' \ -e 's|@WRAPPEE@|'$$w'|g' \ < ${.CURDIR}/../../lang/ocaml/files/wrapper.sh \ > ${BUILDLINK_DIR}/bin/"$$w"; \ diff --git a/lang/openjdk8/buildlink3.mk b/lang/openjdk8/buildlink3.mk index c15e6d64f6b..727672cf0c4 100644 --- a/lang/openjdk8/buildlink3.mk +++ b/lang/openjdk8/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.3 2017/08/03 12:34:03 bsiegert Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:20 rillig Exp $ BUILDLINK_TREE+= openjdk8 .if !defined(OPENJDK8_BUILDLINK3_MK) OPENJDK8_BUILDLINK3_MK:= -LIBDIR_ARCH= ${MACHINE_ARCH:S/x86_64/amd64/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/} +LIBDIR_ARCH= ${MACHINE_ARCH:S/x86_64/amd64/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/} BUILDLINK_LIBDIRS.openjdk8+= java/openjdk8/jre/lib/${LIBDIR_ARCH}/server BUILDLINK_LIBDIRS.openjdk8+= java/openjdk8/jre/lib/${LIBDIR_ARCH} diff --git a/lang/oracle-jdk8/buildlink3.mk b/lang/oracle-jdk8/buildlink3.mk index d2ed6c2b398..27c61d8762d 100644 --- a/lang/oracle-jdk8/buildlink3.mk +++ b/lang/oracle-jdk8/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2015/05/30 09:51:11 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:20 rillig Exp $ BUILDLINK_TREE+= oracle-jdk8 @@ -8,7 +8,7 @@ ORACLE_JDK8_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.oracle-jdk8+= oracle-jdk8-[0-9]* BUILDLINK_ABI_DEPENDS.oracle-jdk8+= oracle-jdk8>=8.0.45 BUILDLINK_PKGSRCDIR.oracle-jdk8?= ../../lang/oracle-jdk8 -BUILDLINK_DEPMETHOD.oracle-jdk8?= build +BUILDLINK_DEPMETHOD.oracle-jdk8?= build BUILDLINK_PASSTHRU_DIRS+= ${BUILDLINK_JAVA_PREFIX.oracle-jre8} diff --git a/lang/ossp-js/buildlink3.mk b/lang/ossp-js/buildlink3.mk index 22c712c2b88..82dd5de92b5 100644 --- a/lang/ossp-js/buildlink3.mk +++ b/lang/ossp-js/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:24:51 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:20 rillig Exp $ BUILDLINK_TREE+= ossp-js @@ -7,7 +7,7 @@ OSSP_JS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ossp-js+= ossp-js>=1.6.20070208nb1 BUILDLINK_PKGSRCDIR.ossp-js?= ../../lang/ossp-js -. include "../../lang/ossp-js/libm.mk" +.include "../../lang/ossp-js/libm.mk" .include "../../mk/dlopen.buildlink3.mk" .endif # OSSP_JS_BUILDLINK3_MK diff --git a/lang/ruby/buildlink3.mk b/lang/ruby/buildlink3.mk index fcc86c0d375..074d2f2183a 100644 --- a/lang/ruby/buildlink3.mk +++ b/lang/ruby/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2014/03/13 17:06:42 taca Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2018/01/07 13:04:20 rillig Exp $ BUILDLINK_TREE+= ${RUBY_BASE} @@ -13,13 +13,13 @@ BUILDLINK_API_DEPENDS.${RUBY_BASE}+= ${RUBY_BASE}>=${RUBY_VERSION} BUILDLINK_ABI_DEPENDS.${RUBY_BASE}+= ${RUBY_BASE}>=${RUBY_ABI_VERSION} BUILDLINK_PKGSRCDIR.${RUBY_BASE}?= ${RUBY_SRCDIR} BUILDLINK_FILES.${RUBY_BASE}+= lib/libruby${RUBY_SUFFIX}.* -BUILDLINK_FILES.${RUBY_BASE}+= lib/ruby/${RUBY_VER_DIR}/${RUBY_ARCH}/*.h +BUILDLINK_FILES.${RUBY_BASE}+= lib/ruby/${RUBY_VER_DIR}/${RUBY_ARCH}/*.h BUILDLINK_TARGETS+= buildlink-bin-ruby buildlink-bin-ruby: ${RUN} \ - f=${BUILDLINK_PREFIX.${RUBY_BASE}:Q}"/bin/ruby${RUBY_SUFFIX}"; \ + f=${BUILDLINK_PREFIX.${RUBY_BASE}}"/bin/ruby${RUBY_SUFFIX}"; \ if ${TEST} -f $$f; then \ ${LN} -s $$f ${BUILDLINK_DIR}/bin/ruby; \ fi diff --git a/lang/sun-jdk6/buildlink3.mk b/lang/sun-jdk6/buildlink3.mk index 1ec9d8472ec..a87efa70f50 100644 --- a/lang/sun-jdk6/buildlink3.mk +++ b/lang/sun-jdk6/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2013/02/28 23:03:58 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:20 rillig Exp $ BUILDLINK_TREE+= sun-jdk6 @@ -7,8 +7,8 @@ SUN_JDK6_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.sun-jdk6+= sun-jdk6-[0-9]* BUILDLINK_ABI_DEPENDS.sun-jdk6+= sun-jdk6>=6.0.4 -BUILDLINK_PKGSRCDIR.sun-jdk6?= ../../lang/sun-jdk6 -BUILDLINK_DEPMETHOD.sun-jdk6?= build +BUILDLINK_PKGSRCDIR.sun-jdk6?= ../../lang/sun-jdk6 +BUILDLINK_DEPMETHOD.sun-jdk6?= build BUILDLINK_PASSTHRU_DIRS+= ${BUILDLINK_JAVA_PREFIX.sun-jre6} diff --git a/lang/sun-jdk7/buildlink3.mk b/lang/sun-jdk7/buildlink3.mk index ca0d4efa39f..8371b01d649 100644 --- a/lang/sun-jdk7/buildlink3.mk +++ b/lang/sun-jdk7/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2013/10/16 16:48:55 richard Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:20 rillig Exp $ BUILDLINK_TREE+= sun-jdk7 @@ -7,8 +7,8 @@ SUN_JDK7_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.sun-jdk7+= sun-jdk7-[0-9]* BUILDLINK_ABI_DEPENDS.sun-jdk7+= sun-jdk7>=7.0.9 -BUILDLINK_PKGSRCDIR.sun-jdk7?= ../../lang/sun-jdk7 -BUILDLINK_DEPMETHOD.sun-jdk7?= build +BUILDLINK_PKGSRCDIR.sun-jdk7?= ../../lang/sun-jdk7 +BUILDLINK_DEPMETHOD.sun-jdk7?= build BUILDLINK_PASSTHRU_DIRS+= ${BUILDLINK_JAVA_PREFIX.sun-jre7} diff --git a/lang/sun-jre6/buildlink3.mk b/lang/sun-jre6/buildlink3.mk index 2d18dad2100..dbd05cb7216 100644 --- a/lang/sun-jre6/buildlink3.mk +++ b/lang/sun-jre6/buildlink3.mk @@ -1,14 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.6 2012/05/07 01:53:43 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:20 rillig Exp $ BUILDLINK_TREE+= sun-jre6 .if !defined(SUN_JRE6_BUILDLINK3_MK) SUN_JRE6_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.sun-jre6+= sun-jre6-[0-9]* -BUILDLINK_ABI_DEPENDS.sun-jre6+= sun-jre6>=6.0.4 +BUILDLINK_API_DEPENDS.sun-jre6+= sun-jre6-[0-9]* +BUILDLINK_ABI_DEPENDS.sun-jre6+= sun-jre6>=6.0.4 BUILDLINK_PKGSRCDIR.sun-jre6?= ../../lang/sun-jre6 -BUILDLINK_JAVA_PREFIX.sun-jre6= ${PREFIX}/java/sun-6 +BUILDLINK_JAVA_PREFIX.sun-jre6= ${PREFIX}/java/sun-6 UNLIMIT_RESOURCES+= datasize # Must be at least 131204 .endif # SUN_JRE6_BUILDLINK3_MK diff --git a/lang/sun-jre7/buildlink3.mk b/lang/sun-jre7/buildlink3.mk index 0a4c138e94f..c200e68f881 100644 --- a/lang/sun-jre7/buildlink3.mk +++ b/lang/sun-jre7/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.2 2013/10/16 16:47:29 richard Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:20 rillig Exp $ BUILDLINK_TREE+= sun-jre7 .if !defined(SUN_JRE7_BUILDLINK3_MK) SUN_JRE7_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.sun-jre7+= sun-jre7-[0-9]* -BUILDLINK_ABI_DEPENDS.sun-jre7+= sun-jre7>=7.0.9 +BUILDLINK_API_DEPENDS.sun-jre7+= sun-jre7-[0-9]* +BUILDLINK_ABI_DEPENDS.sun-jre7+= sun-jre7>=7.0.9 BUILDLINK_PKGSRCDIR.sun-jre7?= ../../lang/sun-jre7 CHECK_BUILTIN.sun-jre7:= yes diff --git a/lang/tcl-otcl/buildlink3.mk b/lang/tcl-otcl/buildlink3.mk index c1b44042cc2..b798ef2bde3 100644 --- a/lang/tcl-otcl/buildlink3.mk +++ b/lang/tcl-otcl/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2014/01/11 14:42:01 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2018/01/07 13:04:20 rillig Exp $ BUILDLINK_TREE+= tcl-otcl @@ -7,7 +7,7 @@ TCL_OTCL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.tcl-otcl+= tcl-otcl>=1.8 BUILDLINK_ABI_DEPENDS.tcl-otcl+= tcl-otcl>=1.14nb4 -BUILDLINK_PKGSRCDIR.tcl-otcl?= ../../lang/tcl-otcl +BUILDLINK_PKGSRCDIR.tcl-otcl?= ../../lang/tcl-otcl .include "../../lang/tcl/buildlink3.mk" .include "../../x11/tk/buildlink3.mk" diff --git a/lang/vala/buildlink3.mk b/lang/vala/buildlink3.mk index 682da5d6137..8f414fb27a3 100644 --- a/lang/vala/buildlink3.mk +++ b/lang/vala/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.16 2017/10/03 12:31:54 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2018/01/07 13:04:20 rillig Exp $ BUILDLINK_TREE+= vala @@ -8,8 +8,8 @@ VALA_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.vala+= vala>=0.38 BUILDLINK_PKGSRCDIR.vala?= ../../lang/vala -VALAC=${LOCALBASE}/bin/valac-0.38 -VAPIGEN=${LOCALBASE}/bin/vapigen-0.38 +VALAC= ${LOCALBASE}/bin/valac-0.38 +VAPIGEN= ${LOCALBASE}/bin/vapigen-0.38 .if defined(GNU_CONFIGURE) CONFIGURE_ENV+= VALAC=${VALAC} VAPIGEN=${VAPIGEN} .endif |