cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handles the case where CONFIGURE_SCRIPT is an absolute path gracefully

Browse Source 
(to deal with a common shared Cygnus configure)

Move MODGNU_configure definition to gnu.port.mk. Should have done that on
creation.

Typo in brad's hack (to be superseded shortly anyways)
This commit is contained in:
espie 2001-09-16 14:56:42 +00:00
parent c6853b6418
commit 27d5739e28
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
infrastructure/mk/bsd.port.mk
View File

@ -1,6 +1,6 @@
#-*- mode: Fundamental; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make:
FULL_REVISION=$$OpenBSD: bsd.port.mk,v 1.456 2001/09/14 15:04:23 espie Exp $$
FULL_REVISION=$$OpenBSD: bsd.port.mk,v 1.457 2001/09/16 14:56:42 espie Exp $$
# $FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $
# $NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $
#
@ -996,11 +996,16 @@ ERRORS+= "Fatal: CATEGORIES is mandatory."
CONFIGURE_SCRIPT?= configure
.if defined(SEPARATE_BUILD)
_CONFIGURE_SCRIPT=${WRKSRC}/${CONFIGURE_SCRIPT}
.if ${CONFIGURE_SCRIPT:M/*}
_CONFIGURE_SCRIPT=${CONFIGURE_SCRIPT}
.else
. if defined(SEPARATE_BUILD)
_CONFIGURE_SCRIPT=${WRKSRC}/${CONFIGURE_SCRIPT}
. else
_CONFIGURE_SCRIPT=./${CONFIGURE_SCRIPT}
. endif
.endif
CONFIGURE_ENV+= PATH=${PORTPATH}
.if defined(NO_SHARED_LIBS)
@ -1595,8 +1600,6 @@ MODSIMPLE_configure= \
YACC="${YACC}" \
${CONFIGURE_ENV} ${_CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
MODGNU_configure= ${MODSIMPLE_configure}
# The real configure
${_CONFIGURE_COOKIE}: ${_PATCH_COOKIE}

6
infrastructure/mk/gnu.port.mk
View File

@ -1,10 +1,12 @@
#-*- mode: Fundamental; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make:
# $OpenBSD: gnu.port.mk,v 1.2 2001/09/03 02:00:48 brad Exp $
# $OpenBSD: gnu.port.mk,v 1.3 2001/09/16 14:56:42 espie Exp $
# Based on bsd.port.mk, originally by Jordan K. Hubbard.
# This file is in the public domain.
# XXX - Kludge for these archictectures so we do not
MODGNU_configure = ${MODSIMPLE_configure}
# XXX - Kludge for these architectures so we do not
# have to patch all copies of config.guess
# throughout the ports tree.
.if ${MACHINE} == "macppc" || ${MACHINE} == "mvmeppc"