Skip to content

Commit

Permalink
x11/babl: fix build on powerpc
Browse files Browse the repository at this point in the history
Clang miscompiles babl-html-dump:
pid 27736 (babl-html-dump), jid 963, uid 65534: exited on signal 11 (core dumped)

Also, -Wno-error=incompatible-function-pointer-types is not compatible with GCC.
  • Loading branch information
pkubaj committed Aug 12, 2023
1 parent 2277417 commit ba1796e
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
2 changes: 2 additions & 0 deletions Mk/Uses/vala.mk
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ BUILD_DEPENDS+= ${_VALA_BINARY}:${_VALA_PORT}
. endif

# remove after https://gitlab.gnome.org/GNOME/vala/-/issues/1408 is fixed
.if ${ARCH} != powerpc
CFLAGS+= -Wno-error=incompatible-function-pointer-types
.endif

.endif
10 changes: 9 additions & 1 deletion x11/babl/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING

LIB_DEPENDS= liblcms2.so:graphics/lcms2

USES= compiler:c11 gnome libtool localbase meson pathfix pkgconfig tar:xz vala:build
USES= gnome libtool localbase meson pathfix pkgconfig tar:xz vala:build

USE_LDCONFIG= yes
USE_GNOME= introspection:build
Expand All @@ -29,6 +29,14 @@ BABL_SHLIB= 0.205.1
BABL_VER= 0.1
PLIST_SUB+= BABL_SHLIB=${BABL_SHLIB} BABL_VER=${BABL_VER}

.include <bsd.port.options.mk>

.if ${ARCH} == powerpc
USES+= compiler:gcc-c++11-lib
.else
USES+= compiler:c11
.endif

.include <bsd.port.pre.mk>

.if ${ARCH} == "amd64"
Expand Down

0 comments on commit ba1796e

Please sign in to comment.