On 2023/02/06 15:43, Willemijn Coene wrote:
> > On 6 Feb 2023, at 13:24, Willemijn Coene <willemijn+obsd-po...@irdc.nl>
> > wrote:
> >
> > Hi,
> >
> >> On 26 Jan 2023, at 15:01, Willemijn Coene <willemijn+obsd-po...@irdc.nl>
> >> wrote:
> >> The attached patch updates lang/swi-prolog to 9.0.3.
> >
> >
> > I’ve respun the patch to update lang/swi-prolog to 9.0.4, and fixed the
> > compiler path that’s embedded into the executable while I was at it.
> > In addition, I think I know why the included test set is failing and may
> > follow up with a patch to base that fixes it.
> > Any chance for this to go in?
>
> Oops, forgot to add a file.
>
: Index: Makefile
: ===================================================================
..
: -SHARED_LIBS = swipl 0.0 # 7.5
: +SHARED_LIBS = swipl 0.0 # 9.0
symbols were added and removed to the shared library, so that needs a
major version bump (i.e. to 1.0)
: CFLAGS += -I${LOCALBASE}/include
: LDFLAGS += -L${LOCALBASE}/lib
: +CONFIGURE_ARGS := -DC_CC='/usr/bin/cc' \
: + -DC_CXX='/usr/bin/c++' \
: + ${CONFIGURE_ARGS}
this should use CC/CXX from the environment or at worst cc/c++ from
the path. in a ports build they typically point to a wrapper script
which handles use of ccache where configured, sets paths to the linker
(which also uses a wrapper script), etc.
usually you don't have to do anything for that with a cmake port,
it's passed in automatically. so probably getting rid of those lines
and patch-cmake_Params_cmake would be the right thing to do.
(don't use := for CONFIGURE_ARGS, ports doesn't honour anything from
CONFIGURE_ARGS passed in by the user, the port makefile is in control)
: CONFIGURE_ENV += CIFLAGS='${CFLAGS}' \
: LDFLAGS='${LDFLAGS}'
CIFLAGS definitely looks obsolete
afaik the correct way to pass linker flags in via cmake now is with
MODCMAKE_LDFLAGS=<whatever> (if they're indeed still needed).
: BUILD_DEPENDS = ${RUN_DEPENDS}
seems obsolete, RUN_DEPENDS is now unset
The cmake files in this autodetect various things (including libarchive,
pcre2, libyaml, maybe also xkb, vulkan) which either need disabling or
adding as listed dependencies)
I'm not sure what is up with the FULLARCH subst, but on my laptop it's
generating files in WRKDIR/fake-amd64/usr/local/lib/swipl/bin/amd64-openbsd7.2
i.e. not changing amd64 to x86_64
So there's a bit more to be done, also I think you'll need the port
maintainer to help take this further.
