Date: Wed, 27 Apr 2005 11:39:10 +0200 From: Jose M Rodriguez <josemi@freebsd.jazztel.es> To: "Undisclosed.Recipients": ; Cc: Kris Kennaway <kris@obsecurity.org> Subject: Re: problems with options in pkg cluster builds. Message-ID: <200504271139.10968.josemi@redesjm.local> In-Reply-To: <200504262227.06290.josemi@redesjm.local> References: <200504260916.11192.josemi@redesjm.local> <20050426195656.GA42269@xor.obsecurity.org> <200504262227.06290.josemi@redesjm.local>
next in thread | previous in thread | raw e-mail | index | archive | help
El Martes, 26 de Abril de 2005 22:27, Jose M Rodriguez escribi=F3:
> El Martes, 26 de Abril de 2005 21:56, Kris Kennaway escribi=F3:
> > On Tue, Apr 26, 2005 at 09:35:46PM +0200, Jose M Rodriguez wrote:
> > > El Martes, 26 de Abril de 2005 21:25, Kris Kennaway escribi?:
> > > > On Tue, Apr 26, 2005 at 09:16:10AM +0200, Jose M Rodriguez=20
wrote:
> > > > > Hi,
> > > > >
> > > > > I'm having problems with pkg cluster builds after latest
> > > > > changes to options code.
> > > > >
> > > > > I want force the way packages must be build from make.conf
> > > > > and pkgtools.conf, but seems that default config is chase due
> > > > > to options code.
> > > > >
> > > > > This is an automated build in a fresh chroot with
> > > > > PACKAGE_BUILDING and BATCH defined that used to work before.
> > > > >
> > > > > Any know method to disabled options code?
> > > > >
> > > > > Any hope that this change may be reverted and options
> > > > > processing is supressed when PACKAGE_BUILDING is defined?
> > > >
> > > > No, this was a deliberate change, so your port needs to
> > > > accomodate it.
> > >
> > > There aren't my ports. I hate local patches.
> > >
> > > I Know this is deliberate. But it's not so simple to workaround
> > > as I spect.
> > >
> > > I'm using local patches. And thinking in do the config and them
> > > populate /var/db/ports from tarball in the beggin of the cluster
> > > scripting.
> > >
> > > but this is really odd.
> >
> > You'll have to explain what problem you're seeing.
>
> I can't be able to make pktools.conf and make.conf supersede ports
> default options from a fresh chroot cage without and /var/db/ports
> dir
>
> Maybe my fault, but ... any clues?
>
> --
> josemi
>
> > Kris
Apart the gs thing, maybe this NO_OPTIONS env aceptable for FreeBSD.
If so, I'll test this, polite and send-pr.
=2D-
josemi
=2D-- patch-no_options begins here ---
Index: bsd.port.mk
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/cvs/freebsd/ports/Mk/bsd.port.mk,v
retrieving revision 1.511
diff -u -r1.511 bsd.port.mk
=2D-- bsd.port.mk 17 Mar 2005 23:22:07 -0000 1.511
+++ bsd.port.mk 27 Apr 2005 09:31:07 -0000
@@ -1085,10 +1085,12 @@
.endif
OPTIONSFILE?=3D ${PORT_DBDIR}/${UNIQUENAME}/options
_OPTIONSFILE!=3D ${ECHO_CMD} "${OPTIONSFILE}"
=2D.if defined(OPTIONS)
+.if !defined(NO_OPTIONS) && defined(OPTIONS)
. if defined(PACKAGE_BUILDING) || (defined(BATCH)=20
&& !exists(${_OPTIONSFILE}))
WITHOUT:=3D
WITH:=3D
+# redundant? see +4
+# I don't understand this piece of code from +3
. if defined(OPTIONS)
REALOPTIONS=3D${OPTIONS:C/".*"//g}
. for O in ${REALOPTIONS}
@@ -1101,6 +1103,7 @@
. endif
OPT:=3D${RO}
. endfor
+# redundant?
. endif
. for W in ${WITH}
WITH_${W}:=3D true
@@ -1786,23 +1789,19 @@
# compatible functionality.
.if !defined(WITHOUT_X11)
.if defined(WITH_GHOSTSCRIPT_AFPL)
=2D.if ${WITH_GHOSTSCRIPT_AFPL} =3D=3D yes
GHOSTSCRIPT_PORT?=3D print/ghostscript-afpl
=2D.else
+.elif defined(WITH_GHOSTSCRIPT_GNU)
GHOSTSCRIPT_PORT?=3D print/ghostscript-gnu
=2D.endif
.else
=2DGHOSTSCRIPT_PORT?=3D print/ghostscript-gnu
+GHOSTSCRIPT_PORT?=3D print/ghostscript-gpl
.endif
.else
.if defined(WITH_GHOSTSCRIPT_AFPL)
=2D.if ${WITH_GHOSTSCRIPT_AFPL} =3D=3D yes
GHOSTSCRIPT_PORT?=3D print/ghostscript-afpl-nox11
=2D.else
+.elif defined(WITH_GHOSTSCRIPT_GNU)
GHOSTSCRIPT_PORT?=3D print/ghostscript-gnu-nox11
=2D.endif
.else
=2DGHOSTSCRIPT_PORT?=3D print/ghostscript-gnu-nox11
+GHOSTSCRIPT_PORT?=3D print/ghostscript-gpl-nox11
.endif
.endif
=20
@@ -2898,6 +2897,7 @@
################################################################
.if (!defined(OPTIONS) || defined(CONFIG_DONE) || \
defined(PACKAGE_BUILDING) || defined(BATCH) || \
+ defined(NO_OPTIONS) || \
exists(${_OPTIONSFILE}) || exists(${_OPTIONSFILE}.local))
_OPTIONS_OK=3Dyes
.endif
@@ -4991,7 +4991,7 @@
=20
.if !target(config)
config:
=2D.if !defined(OPTIONS)
+.if defined(NO_OPTIONS) || !defined(OPTIONS)
@${ECHO_MSG} "=3D=3D=3D> No options to configure"
.else
.if ${OPTIONSFILE} !=3D ${_OPTIONSFILE}
@@ -5078,14 +5078,14 @@
=20
.if !target(config-conditional)
config-conditional:
=2D.if defined(OPTIONS) && !exists(${_OPTIONSFILE})
+.if !defined(NO_OPTIONS) && defined(OPTIONS)=20
&& !exists(${_OPTIONSFILE})
cd ${.CURDIR} && ${MAKE} config;
.endif
.endif
=20
.if !target(showconfig)
showconfig:
=2D.if defined(OPTIONS) && exists(${_OPTIONSFILE})
+.if !defined(NO_OPTIONS) && defined(OPTIONS) && exists(${_OPTIONSFILE})
@${ECHO_MSG} "=3D=3D=3D> The following configuration options are set for=
=20
${PKGNAME}:"
-@if [ -e ${_OPTIONSFILE} ]; then \
. ${_OPTIONSFILE}; \
@@ -5117,7 +5117,7 @@
=20
.if !target(rmconfig)
rmconfig:
=2D.if defined(OPTIONS) && exists(${_OPTIONSFILE})
+.if !defined(NO_OPTIONS) && defined(OPTIONS) && exists(${_OPTIONSFILE})
-@${ECHO_MSG} "=3D=3D=3D> Removing user-configured options for ${PKGNAME}=
";=20
\
if [ `${ID} -u` !=3D 0 -a "x${INSTALL_AS_USER}" =3D "x" ]; then \
${ECHO_MSG} "=3D=3D=3D> Switching to root credentials to remove=20
${_OPTIONSFILE} and `${DIRNAME} ${_OPTIONSFILE}`"; \
=2D-- patch-no_options ends here ---
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200504271139.10968.josemi>