Now with 100% more revision bumps ...
On 9/15/23 23:39, Volker Schlecht wrote:
I haven't run across a case where it was needed, but it makes sense.
ok for the attached diff?
On 9/13/23 20:57, Anil Madhavapeddy wrote:
Yes, that looks fine. Doesn't CFLAGS need a similar change
to propagate the include dirs?
Anil
On 13 Sep 2023, at 11:48, Volker Schlecht
<openbsd-po...@schlecht.dev> wrote:
Ping, and Cc: Maintainer which I forgot initially.
-------- Forwarded Message --------
Subject: [update] ocaml - add X11 libs to LDFLAGS
Date: Wed, 06 Sep 2023 14:55:59 +0200
From: Volker Schlecht <openbsd-po...@schlecht.dev>
To: ports@openbsd.org
OCaml propagates its build time LDFLAGS to the Software it builds.
The attached diff does add ${X11BASE}/lib to that.
While that's not strictly needed right now afaict, it'll help when
updating some of our ports to their latest versions that are 5.x
compatible.
ok?<ocaml-x11.diff>
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/ocaml/Makefile,v
retrieving revision 1.98
diff -u -p -r1.98 Makefile
--- Makefile 3 Sep 2023 14:57:17 -0000 1.98
+++ Makefile 15 Sep 2023 21:42:00 -0000
@@ -3,7 +3,7 @@ COMMENT = ML language with complete c
# XXX Don't even think of updating ocaml alone.
# Do check that the ports that depend on it still work, or repair them.
VERSION= 4.12.1
-REVISION= 4
+REVISION= 5
# if the ocaml compiler gains support for BTI, as well as
# removing USE_NOBTCFI here (or changing to an arch-dependent
@@ -42,8 +42,10 @@ CONFIGURE_ENV+= OBJDUMP=/usr/bin/llvm-o
CONFIGURE_ARGS += --disable-force-safe-string \
--enable-ocamltest
-CFLAGS += -I${LOCALBASE}/include
-LDFLAGS += -L${LOCALBASE}/lib
+CFLAGS += -I${LOCALBASE}/include \
+ -I${X11BASE}/include
+LDFLAGS += -L${LOCALBASE}/lib \
+ -L${X11BASE}/lib
# non-PIC assembly in asmrun/i386.S
.if ${MACHINE_ARCH} == "i386"
