On Thu, 17 Oct 2019 20:52:47 -0400
Kurt Mosiejczuk wrote:
> On Fri, Oct 18, 2019 at 01:51:35AM +0200, Charlene Wendling wrote:
>
> > (Pascal, only this port seems to have this issue, it's FYI)
>
> > > http://build-failures.rhaalovely.net/powerpc/2019-09-17/graphics/DevIL.log
>
> > __vector is an AltiVec keyword. AltiVec is not found by DevIL's
> > configure script, which is actually what we want (G3 machines don't
> > support AltiVec).
>
> > The "problem" comes from gcc-8's _mm_malloc(), that uses that
> > keyword. It seems to me that the old gcc-4.9 didn't have
> > _mm_malloc(), so that's why it's broken since gcc-8 is ports-gcc.
>
> > As such, i've disabled the use of _mm_malloc. While here i've
> > updated WANTLIB.
>
> > It builds fine on amd64, and macppc [0], where i have been able to
> > fix (diff incoming), build and run games/love, its only consumer on
> > macppc.
>
> > Comments/feedback are welcome!
>
> > Charl??ne.
>
> amd64 and sparc64 still build fine with this patch. Although I do get
> a complaint during packaging (and from portcheck) of:
> "LIB_DEPENDS graphics/openjpeg not needed for graphics/DevIL ?"
>
> You didn't touch LIB_DEPENDS though and it happens before your
> change... so OK kmos
It does not seem used at all indeed. Here is an alternate diff that
works fine as well:
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/DevIL/Makefile,v
retrieving revision 1.26
diff -u -p -u -p -r1.26 Makefile
--- Makefile 12 Jul 2019 20:46:56 -0000 1.26
+++ Makefile 18 Oct 2019 01:25:18 -0000
@@ -3,7 +3,7 @@
COMMENT= library for powerful image loading capabilities
DISTNAME= DevIL-1.7.8
-REVISION= 14
+REVISION= 15
SHARED_LIBS+= IL 1.0 # 2.0
SHARED_LIBS+= ILU 1.0 # 2.0
SHARED_LIBS+= ILUT 1.0 # 2.0
@@ -18,11 +18,12 @@ PERMIT_PACKAGE= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openil/}
EXTRACT_SUFX= .zip
-WANTLIB += GL GLU Half ICE Iex IexMath IlmImf IlmThread Imath
-WANTLIB += SDL SM X11 X11-xcb Xdamage Xext Xfixes Xi
-WANTLIB += Xmu Xrandr Xrender Xt Xxf86vm c drm glapi glut iconv jasper
-WANTLIB += jpeg lcms m mng png pthread sndio ${COMPILER_LIBCXX}
-WANTLIB += tiff usbhid xcb xcb-dri2 xcb-glx z expat
+WANTLIB += ${COMPILER_LIBCXX} GL GLU Half ICE Iex IexMath IlmImf
+WANTLIB += IlmThread Imath SDL SM X11 X11-xcb Xdamage Xext Xfixes
+WANTLIB += Xi Xmu Xrandr Xrender Xt Xxf86vm c drm expat glapi
+WANTLIB += glut iconv jasper jpeg lcms m mng png sndio tiff usbhid
+WANTLIB += xcb xcb-dri2 xcb-dri3 xcb-glx xcb-present xcb-sync
+WANTLIB += xcb-xfixes xshmfence z
COMPILER = base-clang ports-gcc base-gcc
@@ -34,7 +35,6 @@ LIB_DEPENDS= converters/libiconv \
graphics/libmng \
graphics/lcms \
graphics/openexr \
- graphics/openjpeg \
graphics/tiff \
graphics/png
@@ -56,6 +56,12 @@ WRKDIST= ${WRKDIR}/${DISTNAME:L}
# Too many Linuxisms in testing tools
NO_TEST= Yes
+
+# gcc-8's _mm_malloc() uses the AltiVec keyword __vector, so we need
+# to disable it to make it run on macppc G3 machines
+.if ${MACHINE_ARCH:Mpowerpc}
+CONFIGURE_ENV += ac_cv_header_mm_malloc_h=
+.endif
post-extract:
chmod +x ${WRKSRC}/configure
