On Tue, 5 Aug 2014 16:41:24 +0200 Luca Pizzamiglio wrote: > Hi list, > I found a small issue with ports-mgmt/portmaster and the variable > DEFAULT_VERSION defined in /etc/make.conf > > I normally use clang, to build my ports, but I use the gcc48 port > also. The actual lang/gcc is gcc 4.7.4, but I wouldn't another gcc > installed :) > In order to use lang/gcc48 instead of lang/gcc, I set > DEFAULT_VERSION=gcc=4.8 in /etc/make.conf > > Now, if you try to build with portmaster any port that requires gcc, > the dependency lang/gcc is added (for instance, with astro/wcslib, but > also www/firefox or mail/thunderbird) > # portmaster -D astro/wcslib > > ===>>> Currently installed version: wcslib-4.23 > ===>>> Port directory: /usr/ports/astro/wcslib > > ===>>> Launching 'make checksum' for astro/wcslib in background > ===>>> Gathering dependency list for astro/wcslib from ports > ===>>> Launching child to install lang/gcc > > ===>>> wcslib-4.23 >> lang/gcc (1/1) > > ===>>> Port directory: /usr/ports/lang/gcc > > ===>>> Launching 'make checksum' for lang/gcc in background > ===>>> Gathering dependency list for lang/gcc from ports > > If I run a simple "make" from the directory /usr/ports/astro/wcslib, > no dependency is added and the right gcc is used. > > Am I the only one with this issue?
Can you try the attached patch?
Index: Mk/Uses/fortran.mk
===================================================================
--- Mk/Uses/fortran.mk (revision 364087)
+++ Mk/Uses/fortran.mk (working copy)
@@ -18,8 +18,13 @@ fortran_ARGS= gcc
.if ${fortran_ARGS} == gcc
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
_GCC_VER= ${GCC_DEFAULT:S/.//}
+.if ${_GCC_VER} == 47
BUILD_DEPENDS+= gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc
RUN_DEPENDS+= gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc
+.else
+BUILD_DEPENDS+= gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc${_GCC_VER}
+RUN_DEPENDS+= gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc${_GCC_VER}
+.endif
USE_BINUTILS= yes
F77= gfortran${_GCC_VER}
FC= gfortran${_GCC_VER}
Index: Mk/bsd.gcc.mk
===================================================================
--- Mk/bsd.gcc.mk (revision 364087)
+++ Mk/bsd.gcc.mk (working copy)
@@ -46,7 +46,8 @@ GCCVERSION_040700= 0 0 4.7
GCCVERSION_040800= 0 0 4.8
GCCVERSION_040900= 0 0 4.9
-GCC_DEFAULT_V= ${GCC_DEFAULT:S/.//}
+# Version of lang/gcc
+GCC_DEFAULT_V= 4.7
# No configurable parts below this. ####################################
#
@@ -148,7 +149,7 @@ _USE_GCC:= ${GCC_DEFAULT}
. if ${OSVERSION} < ${_GCCVERSION_${v}_L} || ${OSVERSION} > ${_GCCVERSION_${v}_R} || !exists(/usr/bin/gcc)
V:= ${_GCCVERSION_${v}_V:S/.//}
_GCC_PORT_DEPENDS:= gcc${V}
-. if ${_USE_GCC} == ${GCC_DEFAULT}
+. if ${_USE_GCC} == ${GCC_DEFAULT_V}
_GCC_PORT:= gcc
. else
_GCC_PORT:= gcc${V}
signature.asc
Description: PGP signature
