Re: [ports-gcc] Unbreak graphics/makehuman

2019-08-28 Thread Stuart Henderson
On 2019/08/27 19:14, Charlene Wendling wrote:
> Hi!
> 
> > http://build-failures.rhaalovely.net/powerpc/2019-08-09/graphics/makehuman.log
> > http://build-failures.rhaalovely.net/sparc64/2019-08-21/graphics/makehuman.log
> 
> It's just some missing headers actually, and once provided it builds [0]
> and runs fine on macppc. amd64 is still good. While here i've removed
> base-gcc from COMPILER, because of COMPILER_LIBCXX being in WANTLIB.

"COMPILER=base-clang ports-gcc base-gcc" is still ok, the problem is when you 
have
a port that doesn't have any COMPILER line, or one with base-gcc before 
ports-gcc,
which will result in a likely stdc++ library conflict.

Of course the only arches affected by removing base-gcc are landisk/m88k
so the only practical effect of changing this is that it won't then be
buildable on arches which already aren't doing ports builds...

> There is still no https version of HOMEPAGE.
> 
> OK? 

OK.

> Charlène.
> 
> 
> [0] https://bin.charlenew.xyz/makehuman.log
> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/makehuman/Makefile,v
> retrieving revision 1.28
> diff -u -p -u -p -r1.28 Makefile
> --- Makefile  12 Jul 2019 20:47:03 -  1.28
> +++ Makefile  26 Aug 2019 16:16:31 -
> @@ -5,7 +5,7 @@ COMMENT=  parametrical modeling of 3D hum
>  DISTNAME=makehuman-0.9.1-rc1a
>  PKGNAME= makehuman-0.9.1rc1
>  CATEGORIES=  graphics
> -REVISION=6
> +REVISION=7
>  
>  # Newer releases available at https://github.com/makehumancommunity/makehuman
>  HOMEPAGE=http://www.makehumancommunity.org/
> @@ -18,7 +18,7 @@ WANTLIB += Xfixes Xi Xmu Xrandr Xrender 
>  WANTLIB += glapi glut m mhgui png pthread xcb xcb-dri2 xcb-dri3 xcb-glx
>  WANTLIB += xcb-present xcb-sync xcb-xfixes xshmfence z
>  
> -COMPILER =   base-clang ports-gcc base-gcc
> +COMPILER =   base-clang ports-gcc
>  
>  # gcp(1), see pre-configure
>  BUILD_DEPENDS=   sysutils/coreutils
> Index: patches/patch-src_FileTools_cpp
> ===
> RCS file: patches/patch-src_FileTools_cpp
> diff -N patches/patch-src_FileTools_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_FileTools_cpp   26 Aug 2019 16:16:31 -
> @@ -0,0 +1,15 @@
> +$OpenBSD$
> +
> +Add missing header for ports-gcc
> +
> +Index: src/FileTools.cpp
> +--- src/FileTools.cpp.orig
>  src/FileTools.cpp
> +@@ -38,6 +38,7 @@
> + #endif // _FileTools_H_
> + 
> + #include 
> ++#include 
> + #include 
> + #include 
> + #include 
> Index: patches/patch-src_util_h
> ===
> RCS file: patches/patch-src_util_h
> diff -N patches/patch-src_util_h
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_util_h  26 Aug 2019 16:16:31 -
> @@ -0,0 +1,15 @@
> +$OpenBSD$
> +
> +Add missing headers for ports-gcc
> +
> +Index: src/util.h
> +--- src/util.h.orig
>  src/util.h
> +@@ -31,6 +31,7 @@
> +   #include 
> + #endif
> + 
> ++#include 
> + #include 
> + #include 
> + #include 
> 



[ports-gcc] Unbreak graphics/makehuman

2019-08-27 Thread Charlene Wendling
Hi!

> http://build-failures.rhaalovely.net/powerpc/2019-08-09/graphics/makehuman.log
> http://build-failures.rhaalovely.net/sparc64/2019-08-21/graphics/makehuman.log

It's just some missing headers actually, and once provided it builds [0]
and runs fine on macppc. amd64 is still good. While here i've removed
base-gcc from COMPILER, because of COMPILER_LIBCXX being in WANTLIB.

There is still no https version of HOMEPAGE.

OK? 

Charlène.


[0] https://bin.charlenew.xyz/makehuman.log


Index: Makefile
===
RCS file: /cvs/ports/graphics/makehuman/Makefile,v
retrieving revision 1.28
diff -u -p -u -p -r1.28 Makefile
--- Makefile12 Jul 2019 20:47:03 -  1.28
+++ Makefile26 Aug 2019 16:16:31 -
@@ -5,7 +5,7 @@ COMMENT=parametrical modeling of 3D hum
 DISTNAME=  makehuman-0.9.1-rc1a
 PKGNAME=   makehuman-0.9.1rc1
 CATEGORIES=graphics
-REVISION=  6
+REVISION=  7
 
 # Newer releases available at https://github.com/makehumancommunity/makehuman
 HOMEPAGE=  http://www.makehumancommunity.org/
@@ -18,7 +18,7 @@ WANTLIB += Xfixes Xi Xmu Xrandr Xrender 
 WANTLIB += glapi glut m mhgui png pthread xcb xcb-dri2 xcb-dri3 xcb-glx
 WANTLIB += xcb-present xcb-sync xcb-xfixes xshmfence z
 
-COMPILER = base-clang ports-gcc base-gcc
+COMPILER = base-clang ports-gcc
 
 # gcp(1), see pre-configure
 BUILD_DEPENDS= sysutils/coreutils
Index: patches/patch-src_FileTools_cpp
===
RCS file: patches/patch-src_FileTools_cpp
diff -N patches/patch-src_FileTools_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_FileTools_cpp 26 Aug 2019 16:16:31 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Add missing header for ports-gcc
+
+Index: src/FileTools.cpp
+--- src/FileTools.cpp.orig
 src/FileTools.cpp
+@@ -38,6 +38,7 @@
+ #endif // _FileTools_H_
+ 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
Index: patches/patch-src_util_h
===
RCS file: patches/patch-src_util_h
diff -N patches/patch-src_util_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_util_h26 Aug 2019 16:16:31 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Add missing headers for ports-gcc
+
+Index: src/util.h
+--- src/util.h.orig
 src/util.h
+@@ -31,6 +31,7 @@
+   #include 
+ #endif
+ 
++#include 
+ #include 
+ #include 
+ #include