Re: Unbreak lang/seed7 on hppa

2014-02-21 Thread Tobias Ulmer
On Fri, Feb 21, 2014 at 08:07:47PM +0100, Juan Francisco Cantero Hurtado wrote:
> On Fri, Feb 21, 2014 at 12:32:58PM +0100, Marc Espie wrote:
> > On Fri, Feb 21, 2014 at 10:51:06AM +, Stuart Henderson wrote:
> > > Is this instead a target dependency issue? If you do "make a b c" without
> > > Makefile dependencies between them, I don't think there's any guarantee
> > > that they will run in order.
> > 
> > There isn't, indeed.
> > 
> > make in "traditional non-parallel mode" will tend to run them in order,
> > as lots of people don't know how to use make so that things are a bit 
> > friendlier, but I don't know if gmake does the same, and it's certainly
> > not guaranteed.
> > 
> 
> I've found where is the error. I had "MAKE_JOBS=2" in /etc/mk.conf.
> On my other machines, I have "PARALLEL_BUILD=NO" so I was not seeing the
> same error.
> 
> OK to unbreak the package on hppa? All tests pass.

Did a quick test build/check on hppa, OK by me.

> 
> 
> Index: Makefile
> ===
> RCS file: /usr/cvsync/ports/lang/seed7/Makefile,v
> retrieving revision 1.14
> diff -u -p -r1.14 Makefile
> --- Makefile  19 Jan 2014 20:21:01 -  1.14
> +++ Makefile  21 Feb 2014 19:04:47 -
> @@ -1,7 +1,5 @@
>  # $OpenBSD: Makefile,v 1.14 2014/01/19 20:21:01 bcallah Exp $
>  
> -BROKEN-hppa =SIGILL compiling prg/s7c
> -
>  V =  20140119
>  COMMENT =high-level, extensible programming language
>  DISTNAME =   seed7_05_${V}
> 



Re: Unbreak lang/seed7 on hppa

2014-02-21 Thread Juan Francisco Cantero Hurtado
On Fri, Feb 21, 2014 at 09:29:29PM +0100, Marc Espie wrote:
> On Fri, Feb 21, 2014 at 08:07:47PM +0100, Juan Francisco Cantero Hurtado 
> wrote:
> > On Fri, Feb 21, 2014 at 12:32:58PM +0100, Marc Espie wrote:
> > > On Fri, Feb 21, 2014 at 10:51:06AM +, Stuart Henderson wrote:
> > > > Is this instead a target dependency issue? If you do "make a b c" 
> > > > without
> > > > Makefile dependencies between them, I don't think there's any guarantee
> > > > that they will run in order.
> > > 
> > > There isn't, indeed.
> > > 
> > > make in "traditional non-parallel mode" will tend to run them in order,
> > > as lots of people don't know how to use make so that things are a bit 
> > > friendlier, but I don't know if gmake does the same, and it's certainly
> > > not guaranteed.
> > > 
> > 
> > I've found where is the error. I had "MAKE_JOBS=2" in /etc/mk.conf.
> > On my other machines, I have "PARALLEL_BUILD=NO" so I was not seeing the
> > same error.
> 
> Don't *ever* put MAKE_JOBS=2 in /etc/mk.conf
> you're guaranteed to break things very badly.

First error in one year and half :) . I will delete the variable from
mk.conf.

-- 
Juan Francisco Cantero Hurtado http://juanfra.info



Re: Unbreak lang/seed7 on hppa

2014-02-21 Thread Marc Espie
On Fri, Feb 21, 2014 at 08:07:47PM +0100, Juan Francisco Cantero Hurtado wrote:
> On Fri, Feb 21, 2014 at 12:32:58PM +0100, Marc Espie wrote:
> > On Fri, Feb 21, 2014 at 10:51:06AM +, Stuart Henderson wrote:
> > > Is this instead a target dependency issue? If you do "make a b c" without
> > > Makefile dependencies between them, I don't think there's any guarantee
> > > that they will run in order.
> > 
> > There isn't, indeed.
> > 
> > make in "traditional non-parallel mode" will tend to run them in order,
> > as lots of people don't know how to use make so that things are a bit 
> > friendlier, but I don't know if gmake does the same, and it's certainly
> > not guaranteed.
> > 
> 
> I've found where is the error. I had "MAKE_JOBS=2" in /etc/mk.conf.
> On my other machines, I have "PARALLEL_BUILD=NO" so I was not seeing the
> same error.

Don't *ever* put MAKE_JOBS=2 in /etc/mk.conf
you're guaranteed to break things very badly.



Re: Unbreak lang/seed7 on hppa

2014-02-21 Thread Brian Callahan

On 2/21/2014 2:07 PM, Juan Francisco Cantero Hurtado wrote:

On Fri, Feb 21, 2014 at 12:32:58PM +0100, Marc Espie wrote:

On Fri, Feb 21, 2014 at 10:51:06AM +, Stuart Henderson wrote:

Is this instead a target dependency issue? If you do "make a b c" without
Makefile dependencies between them, I don't think there's any guarantee
that they will run in order.


There isn't, indeed.

make in "traditional non-parallel mode" will tend to run them in order,
as lots of people don't know how to use make so that things are a bit
friendlier, but I don't know if gmake does the same, and it's certainly
not guaranteed.



I've found where is the error. I had "MAKE_JOBS=2" in /etc/mk.conf.
On my other machines, I have "PARALLEL_BUILD=NO" so I was not seeing the
same error.

OK to unbreak the package on hppa? All tests pass.



It's OK for me, but since we're in lock you should probably get an OK 
from someone else too.


~Brian



Index: Makefile
===
RCS file: /usr/cvsync/ports/lang/seed7/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile19 Jan 2014 20:21:01 -  1.14
+++ Makefile21 Feb 2014 19:04:47 -
@@ -1,7 +1,5 @@
  # $OpenBSD: Makefile,v 1.14 2014/01/19 20:21:01 bcallah Exp $

-BROKEN-hppa =  SIGILL compiling prg/s7c
-
  V =   20140119
  COMMENT = high-level, extensible programming language
  DISTNAME =seed7_05_${V}





Re: Unbreak lang/seed7 on hppa

2014-02-21 Thread Juan Francisco Cantero Hurtado
On Fri, Feb 21, 2014 at 12:32:58PM +0100, Marc Espie wrote:
> On Fri, Feb 21, 2014 at 10:51:06AM +, Stuart Henderson wrote:
> > Is this instead a target dependency issue? If you do "make a b c" without
> > Makefile dependencies between them, I don't think there's any guarantee
> > that they will run in order.
> 
> There isn't, indeed.
> 
> make in "traditional non-parallel mode" will tend to run them in order,
> as lots of people don't know how to use make so that things are a bit 
> friendlier, but I don't know if gmake does the same, and it's certainly
> not guaranteed.
> 

I've found where is the error. I had "MAKE_JOBS=2" in /etc/mk.conf.
On my other machines, I have "PARALLEL_BUILD=NO" so I was not seeing the
same error.

OK to unbreak the package on hppa? All tests pass.


Index: Makefile
===
RCS file: /usr/cvsync/ports/lang/seed7/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile19 Jan 2014 20:21:01 -  1.14
+++ Makefile21 Feb 2014 19:04:47 -
@@ -1,7 +1,5 @@
 # $OpenBSD: Makefile,v 1.14 2014/01/19 20:21:01 bcallah Exp $
 
-BROKEN-hppa =  SIGILL compiling prg/s7c
-
 V =20140119
 COMMENT =  high-level, extensible programming language
 DISTNAME = seed7_05_${V}



Re: Unbreak lang/seed7 on hppa

2014-02-21 Thread Juan Francisco Cantero Hurtado
On Thu, Feb 20, 2014 at 11:07:01PM -0500, Brian Callahan wrote:
> On 2/20/2014 4:29 PM, Juan Francisco Cantero Hurtado wrote:
> >Brian asked me to compile and to test the last version of seed7 on hppa.
> >The result is a little weird, so let me know if you have a better fix or
> >just give me the OKs.
> >
> 
> So I'm assuming it builds correctly with this fix? But does it work?

Yes, "make package" and "make test" work fine.

> 
> >Apparently gmake doesn't honor ALL_TARGET on hppa. I tried also running
> >directly "gmake -f makefile depend s7 s7c" within WRKSRC or removing
> >ALL_TARGET from the port makefile and adding "all: depend s7 s7c" to
> >WRKSRC/makefile". Nothing worked. gmake doesn't run "depend".
> >
> 
> Blah. That is pretty crappy. I really hope there's a better fix.
> 
> ~Brian
> 
> >
> >Index: Makefile
> >===
> >RCS file: /cvs/ports/lang/seed7/Makefile,v
> >retrieving revision 1.14
> >diff -u -p -r1.14 Makefile
> >--- Makefile 19 Jan 2014 20:21:01 -  1.14
> >+++ Makefile 20 Feb 2014 21:08:32 -
> >@@ -1,8 +1,7 @@
> >  # $OpenBSD: Makefile,v 1.14 2014/01/19 20:21:01 bcallah Exp $
> >
> >-BROKEN-hppa =   SIGILL compiling prg/s7c
> >-
> >  V =20140119
> >+REVISION =  0
> >  COMMENT =  high-level, extensible programming language
> >  DISTNAME = seed7_05_${V}
> >  PKGNAME =  seed7-${V}
> >@@ -26,7 +25,8 @@ MAKE_FLAGS =   CC="${CC}" LDFLAGS="-Wl,--g
> >  MAKE_ENV +=S7_LIB_DIR=${TRUEPREFIX}/lib/seed7/bin \
> > SEED7_LIBRARY=${TRUEPREFIX}/lib/seed7/lib
> >  MAKE_FILE =makefile
> >-ALL_TARGET =depend s7 s7c
> >+# Surprisingly, ALL_TARGET doesn't work on HPPA.
> >+#ALL_TARGET =   depend s7 s7c
> >
> >  CFLAGS +=  -I${X11BASE}/include
> >
> >@@ -36,6 +36,12 @@ WRKSRC =  ${WRKDIST}/src
> >  post-patch:
> > perl -pi -e "s,-O2,${CFLAGS},g" ${WRKSRC}/makefile
> > perl -pi -e "s,/usr,${TRUEPREFIX},g" ${WRKDIST}/doc/s7{,c}.1
> >+
> >+do-build:
> >+cd ${WRKSRC} && \
> >+${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} 
> >depend && \
> >+${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} s7 
> >&& \
> >+${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} s7c
> >
> >  do-install:
> > ${INSTALL_PROGRAM} ${WRKDIST}/bin/s7{,c} ${PREFIX}/bin
> >
> 

-- 
Juan Francisco Cantero Hurtado http://juanfra.info



Re: Unbreak lang/seed7 on hppa

2014-02-21 Thread Juan Francisco Cantero Hurtado
On Fri, Feb 21, 2014 at 10:51:06AM +, Stuart Henderson wrote:
> On 2014/02/20 23:07, Brian Callahan wrote:
> > >Apparently gmake doesn't honor ALL_TARGET on hppa. I tried also running
> > >directly "gmake -f makefile depend s7 s7c" within WRKSRC or removing
> > >ALL_TARGET from the port makefile and adding "all: depend s7 s7c" to
> > >WRKSRC/makefile". Nothing worked. gmake doesn't run "depend".
> > >
> > 
> > Blah. That is pretty crappy. I really hope there's a better fix.
> 
> ALL_TARGET is just passed on the make command line, I see no reason at
> all why that would fail to be honoured on hppa, I'd expect far more
> failures than just this.
> 
> Is this instead a target dependency issue? If you do "make a b c" without
> Makefile dependencies between them, I don't think there's any guarantee
> that they will run in order.
> 
> > >+do-build:
> > >+  cd ${WRKSRC} && \
> > >+  ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} 
> > >depend && \
> > >+  ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} s7 
> > >&& \
> > >+  ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} s7c
> 
> Running the depend stage in pre-build and "s7 s7c" in ALL_TARGETS may work
> and might be a bit nicer..

The last target fails:
gmake: ../bin/s7: Command not found
makefile:134: recipe for target '../prg/s7c' failed
gmake: *** [../prg/s7c] Error 127
gmake: *** Waiting for unfinished jobs

-- 
Juan Francisco Cantero Hurtado http://juanfra.info



Re: Unbreak lang/seed7 on hppa

2014-02-21 Thread Marc Espie
On Fri, Feb 21, 2014 at 10:51:06AM +, Stuart Henderson wrote:
> Is this instead a target dependency issue? If you do "make a b c" without
> Makefile dependencies between them, I don't think there's any guarantee
> that they will run in order.

There isn't, indeed.

make in "traditional non-parallel mode" will tend to run them in order,
as lots of people don't know how to use make so that things are a bit 
friendlier, but I don't know if gmake does the same, and it's certainly
not guaranteed.



Re: Unbreak lang/seed7 on hppa

2014-02-21 Thread Stuart Henderson
On 2014/02/20 23:07, Brian Callahan wrote:
> >Apparently gmake doesn't honor ALL_TARGET on hppa. I tried also running
> >directly "gmake -f makefile depend s7 s7c" within WRKSRC or removing
> >ALL_TARGET from the port makefile and adding "all: depend s7 s7c" to
> >WRKSRC/makefile". Nothing worked. gmake doesn't run "depend".
> >
> 
> Blah. That is pretty crappy. I really hope there's a better fix.

ALL_TARGET is just passed on the make command line, I see no reason at
all why that would fail to be honoured on hppa, I'd expect far more
failures than just this.

Is this instead a target dependency issue? If you do "make a b c" without
Makefile dependencies between them, I don't think there's any guarantee
that they will run in order.

> >+do-build:
> >+cd ${WRKSRC} && \
> >+${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} 
> >depend && \
> >+${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} s7 
> >&& \
> >+${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} s7c

Running the depend stage in pre-build and "s7 s7c" in ALL_TARGETS may work
and might be a bit nicer..



Re: Unbreak lang/seed7 on hppa

2014-02-20 Thread Brian Callahan

On 2/20/2014 4:29 PM, Juan Francisco Cantero Hurtado wrote:

Brian asked me to compile and to test the last version of seed7 on hppa.
The result is a little weird, so let me know if you have a better fix or
just give me the OKs.



So I'm assuming it builds correctly with this fix? But does it work?


Apparently gmake doesn't honor ALL_TARGET on hppa. I tried also running
directly "gmake -f makefile depend s7 s7c" within WRKSRC or removing
ALL_TARGET from the port makefile and adding "all: depend s7 s7c" to
WRKSRC/makefile". Nothing worked. gmake doesn't run "depend".



Blah. That is pretty crappy. I really hope there's a better fix.

~Brian



Index: Makefile
===
RCS file: /cvs/ports/lang/seed7/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile19 Jan 2014 20:21:01 -  1.14
+++ Makefile20 Feb 2014 21:08:32 -
@@ -1,8 +1,7 @@
  # $OpenBSD: Makefile,v 1.14 2014/01/19 20:21:01 bcallah Exp $

-BROKEN-hppa =  SIGILL compiling prg/s7c
-
  V =   20140119
+REVISION = 0
  COMMENT = high-level, extensible programming language
  DISTNAME =seed7_05_${V}
  PKGNAME = seed7-${V}
@@ -26,7 +25,8 @@ MAKE_FLAGS =  CC="${CC}" LDFLAGS="-Wl,--g
  MAKE_ENV +=   S7_LIB_DIR=${TRUEPREFIX}/lib/seed7/bin \
SEED7_LIBRARY=${TRUEPREFIX}/lib/seed7/lib
  MAKE_FILE =   makefile
-ALL_TARGET =   depend s7 s7c
+# Surprisingly, ALL_TARGET doesn't work on HPPA.
+#ALL_TARGET =  depend s7 s7c

  CFLAGS += -I${X11BASE}/include

@@ -36,6 +36,12 @@ WRKSRC = ${WRKDIST}/src
  post-patch:
perl -pi -e "s,-O2,${CFLAGS},g" ${WRKSRC}/makefile
perl -pi -e "s,/usr,${TRUEPREFIX},g" ${WRKDIST}/doc/s7{,c}.1
+
+do-build:
+   cd ${WRKSRC} && \
+   ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} depend 
&& \
+   ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} s7 
&& \
+   ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKE_FILE} s7c

  do-install:
${INSTALL_PROGRAM} ${WRKDIST}/bin/s7{,c} ${PREFIX}/bin