diff options
| author | fhajny <fhajny@pkgsrc.org> | 2012-02-06 12:49:38 +0000 |
|---|---|---|
| committer | fhajny <fhajny@pkgsrc.org> | 2012-02-06 12:49:38 +0000 |
| commit | f92b10e92e0b0fd62c66fdc2043be7e886fa8d90 (patch) | |
| tree | f5f2668c8d0f9816f9276926831fa3d67248cd43 /mk | |
| parent | 13f588951c270182a2fcf1561fea51852906902d (diff) | |
| download | pkgsrc-f92b10e92e0b0fd62c66fdc2043be7e886fa8d90.tar.gz | |
Revert runaway commit
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/fetch/fetch.mk | 3 | ||||
| -rw-r--r-- | mk/tools/replace.mk | 4 | ||||
| -rw-r--r-- | mk/wrapper/transform-gcc | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/mk/fetch/fetch.mk b/mk/fetch/fetch.mk index cbaa481bbb1..af4adc26116 100644 --- a/mk/fetch/fetch.mk +++ b/mk/fetch/fetch.mk @@ -1,4 +1,4 @@ -# $NetBSD: fetch.mk,v 1.54 2012/02/06 12:41:29 fhajny Exp $ +# $NetBSD: fetch.mk,v 1.55 2012/02/06 12:49:38 fhajny Exp $ _MASTER_SITE_BACKUP= ${MASTER_SITE_BACKUP:=${DIST_SUBDIR}${DIST_SUBDIR:D/}} _MASTER_SITE_OVERRIDE= ${MASTER_SITE_OVERRIDE:=${DIST_SUBDIR}${DIST_SUBDIR:D/}} @@ -266,6 +266,7 @@ _FETCH_ARGS+= -d ${DIST_SUBDIR} .PHONY: do-fetch-file do-fetch-file: .USE @${STEP_MSG} "Fetching ${.TARGET:T}" + ${RUN} ${MKDIR} ${.TARGET:H} ${RUN} \ for d in "" ${DIST_PATH:S/:/ /g}; do \ case $$d in \ diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index 1f3fd2489cc..1bae6b41ed3 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.242 2012/02/06 12:41:29 fhajny Exp $ +# $NetBSD: replace.mk,v 1.243 2012/02/06 12:49:38 fhajny Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -737,7 +737,7 @@ MAKEFLAGS+= TOOLS_IGNORE.tar= TOOLS_DEPENDS.tar?= pax>=20040802:../../archivers/pax TOOLS_CREATE+= tar TOOLS_FIND_PREFIX+= TOOLS_PREFIX.tar=pax -TOOLS_PATH.tar= ${TOOLS_PREFIX.tar}/bin/${NBPAX_PROGRAM_PREFIX}tar +TOOLS_PATH.tar= ${TOOLS_PREFIX.tar}/bin/tar . endif .endif diff --git a/mk/wrapper/transform-gcc b/mk/wrapper/transform-gcc index b3b2187aa10..8eb5d5eccad 100644 --- a/mk/wrapper/transform-gcc +++ b/mk/wrapper/transform-gcc @@ -1,4 +1,4 @@ -# $NetBSD: transform-gcc,v 1.23 2012/02/06 12:41:29 fhajny Exp $ +# $NetBSD: transform-gcc,v 1.24 2012/02/06 12:49:38 fhajny Exp $ # # This file handles the transformations needed for gcc that can be done # looking at only one argument at a time. @@ -112,9 +112,6 @@ case $arg in # There are some packages suppressing all warnings. We don't want that. -w ) transform_discard ;; -# Discard visibility (Sun linker won't support it) --fvisibility=* ) transform_discard ;; - # Options specific to g++. -fexceptions |\ -fmessage-length=* |\ |