x11/motif: Fix cross-build.

5 files changed, 90 insertions, 3 deletions

diff --git a/x11/motif/Makefile b/x11/motif/Makefile
index f55b3f4fe63..079a3f871d9 100644
--- a/x11/motif/Makefile
+++ b/x11/motif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2020/08/17 20:17:55 leot Exp $
+# $NetBSD: Makefile,v 1.18 2022/04/05 10:00:21 riastradh Exp $
 
 DISTNAME=		motif-2.3.8
 PKGREVISION=		1
@@ -49,7 +49,12 @@ CFLAGS.SunOS+=		-D_POSIX_PTHREAD_SEMANTICS
 
 .if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
 MAKE_FLAGS+=	CROSS_COMPILING=yes CC_FOR_BUILD=${NATIVE_CC:Q} \
-		CPPFLAGS_FOR_BUILD=-I${PREFIX}/include
+		CPPFLAGS_FOR_BUILD=-I${PREFIX:Q}/include \
+		LDFLAGS_FOR_BUILD=-L${PREFIX:Q}/lib\ ${COMPILER_RPATH_FLAG:Q}${PREFIX:Q}/lib \
+		LIBS_FOR_BUILD=-lXt
+CONFIGURE_ARGS.NetBSD+=	ac_cv_file__usr_X_include_X11_X_h=no
+CONFIGURE_ARGS.NetBSD+=	ac_cv_file__usr_X11R6_include_X11_X_h=no
+TOOL_DEPENDS+=		libXt>=0:../../x11/libXt
 .endif
 
 # 1) Fix the man pages to refer to the correct sections.
diff --git a/x11/motif/distinfo b/x11/motif/distinfo
index edaaf29e98d..38e5135e510 100644
--- a/x11/motif/distinfo
+++ b/x11/motif/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2022/04/05 09:59:56 riastradh Exp $
+$NetBSD: distinfo,v 1.12 2022/04/05 10:00:21 riastradh Exp $
 
 BLAKE2s (motif-2.3.8.tar.gz) = b82ee8dac7a840aaa0f364e5b5c018d053a1eb42433e52e5b54f7742d34cbb23
 SHA512 (motif-2.3.8.tar.gz) = 1ab8e8eece25ef97e948592b5fa3e19d98e932695290a18b7a8e90f1aa2766bc4f082bdbc3999dff5660e684821178a149040f76bb477163e53ca06474d02b55
@@ -7,6 +7,7 @@ SHA1 (patch-Makefile.in) = 9f4573cd47989a821ea616df53da924766fe3d39
 SHA1 (patch-clients_uil_UilDB.c) = 781b52e915e667eeb02359a51cfeefdb9556c4dd
 SHA1 (patch-clients_uil_UilDefI.h) = 6447a306809e65b4993d79e14a989a01aed2e0bc
 SHA1 (patch-clients_uil_UilDiags.c) = 39ac8307219b435baf3d1bf829809fcb6536b1a9
+SHA1 (patch-config_util_Makefile.in) = 38ee59c863c4fd1220850c9f35379d305611623a
 SHA1 (patch-doc_man_man3_Makefile.am) = b396f5e1235834f507a415c62b0efaa939943f1d
 SHA1 (patch-doc_man_man4_Makefile.am) = 154071494cf54a65e2e266861c81771a14156cae
 SHA1 (patch-doc_man_man5_Makefile.am) = 2f6e0cc239faf53e3391aef9da3def934023928e
@@ -23,4 +24,6 @@ SHA1 (patch-lib_Xm_Xmos.c) = 88af3627fad7c9ec40db0e8aca47e9617fe8c53b
 SHA1 (patch-lib_Xm_XpmI.h) = b27e0156bc2dd990a4d9642186b1638276054314
 SHA1 (patch-lib_Xm_Xpmparse.c) = 95eb0d2d59fcd8c3dd4c9622e17568b35ffbe133
 SHA1 (patch-lib_Xm_Xpmrgb.c) = 494506830c6e96bffe691b511ebe52dd0a1ac2ab
+SHA1 (patch-tools_wml_Makefile.in) = 766b58839ff92efc926e9aedac57c8da5f291933
+SHA1 (patch-tools_wml_wmldbcreate.c) = 72c7b768d960a41b6a3b9b4639f1fc042e3e9282
 SHA1 (patch-tools_wml_wmluiltok.l) = 1e79df5605ad8b25a55fbb617a707d27d27e3f2a
diff --git a/x11/motif/patches/patch-config_util_Makefile.in b/x11/motif/patches/patch-config_util_Makefile.in
new file mode 100644
index 00000000000..5af23188b81
--- /dev/null
+++ b/x11/motif/patches/patch-config_util_Makefile.in
@@ -0,0 +1,19 @@
+$NetBSD: patch-config_util_Makefile.in,v 1.1 2022/04/05 10:00:21 riastradh Exp $
+
+Build makestrs as a tool to run during build.
+
+--- config/util/Makefile.in.orig	2017-12-05 12:49:57.000000000 +0000
++++ config/util/Makefile.in
+@@ -385,7 +385,11 @@ clean-noinstPROGRAMS:
+ 
+ makestrs$(EXEEXT): $(makestrs_OBJECTS) $(makestrs_DEPENDENCIES) $(EXTRA_makestrs_DEPENDENCIES) 
+ 	@rm -f makestrs$(EXEEXT)
+-	$(AM_V_CCLD)$(LINK) $(makestrs_OBJECTS) $(makestrs_LDADD) $(LIBS)
++	$(AM_V_CCLD)$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ $(makestrs_OBJECTS) $(LIBS_FOR_BUILD)
++
++makestrs.$(OBJEXT): makestrs.c
++	$(AM_V_CC)$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
diff --git a/x11/motif/patches/patch-tools_wml_Makefile.in b/x11/motif/patches/patch-tools_wml_Makefile.in
new file mode 100644
index 00000000000..61ca44055cf
--- /dev/null
+++ b/x11/motif/patches/patch-tools_wml_Makefile.in
@@ -0,0 +1,43 @@
+$NetBSD: patch-tools_wml_Makefile.in,v 1.1 2022/04/05 10:00:21 riastradh Exp $
+
+Build wml, wmldbcreate, and wmluitok as tools to run at build-time.
+
+--- tools/wml/Makefile.in.orig	2017-12-05 12:49:59.000000000 +0000
++++ tools/wml/Makefile.in
+@@ -484,15 +484,15 @@ clean-noinstPROGRAMS:
+ 
+ wml$(EXEEXT): $(wml_OBJECTS) $(wml_DEPENDENCIES) $(EXTRA_wml_DEPENDENCIES) 
+ 	@rm -f wml$(EXEEXT)
+-	$(AM_V_CCLD)$(LINK) $(wml_OBJECTS) $(wml_LDADD) $(LIBS)
++	$(AM_V_CCLD)$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ $(wml_OBJECTS) $(LIBS_FOR_BUILD) $(wml_LDADD)
+ 
+ wmldbcreate$(EXEEXT): $(wmldbcreate_OBJECTS) $(wmldbcreate_DEPENDENCIES) $(EXTRA_wmldbcreate_DEPENDENCIES) 
+ 	@rm -f wmldbcreate$(EXEEXT)
+-	$(AM_V_CCLD)$(LINK) $(wmldbcreate_OBJECTS) $(wmldbcreate_LDADD) $(LIBS)
++	$(AM_V_CCLD)$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ $(wmldbcreate_OBJECTS) $(LIBS_FOR_BUILD)
+ 
+ wmluiltok$(EXEEXT): $(wmluiltok_OBJECTS) $(wmluiltok_DEPENDENCIES) $(EXTRA_wmluiltok_DEPENDENCIES) 
+ 	@rm -f wmluiltok$(EXEEXT)
+-	$(AM_V_CCLD)$(LINK) $(wmluiltok_OBJECTS) $(wmluiltok_LDADD) $(LIBS)
++	$(AM_V_CCLD)$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ $(wmluiltok_OBJECTS) $(LIBS_FOR_BUILD) $(wmluiltok_LDADD)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -513,7 +513,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wmlutils.Po@am__quote@
+ 
+ .c.o:
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@@ -534,7 +534,7 @@ distclean-compile:
+ @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+ 
+ wmldbcreate.o: $(srcdir)/wmldbcreate.c
+-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wmldbcreate.o -MD -MP -MF $(DEPDIR)/wmldbcreate.Tpo -c -o wmldbcreate.o `test -f '$(srcdir)/wmldbcreate.c' || echo '$(srcdir)/'`$(srcdir)/wmldbcreate.c
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(INCLUDES) -MT wmldbcreate.o -MD -MP -MF $(DEPDIR)/wmldbcreate.Tpo -c -o wmldbcreate.o `test -f '$(srcdir)/wmldbcreate.c' || echo '$(srcdir)/'`$(srcdir)/wmldbcreate.c
+ @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/wmldbcreate.Tpo $(DEPDIR)/wmldbcreate.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(srcdir)/wmldbcreate.c' object='wmldbcreate.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
diff --git a/x11/motif/patches/patch-tools_wml_wmldbcreate.c b/x11/motif/patches/patch-tools_wml_wmldbcreate.c
new file mode 100644
index 00000000000..3fae2f67797
--- /dev/null
+++ b/x11/motif/patches/patch-tools_wml_wmldbcreate.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-tools_wml_wmldbcreate.c,v 1.1 2022/04/05 10:00:21 riastradh Exp $
+
+wmldbcreate is a tool that runs at build-time.  Rather than link
+against libXm, which may have been cross-compiled, just include the one
+set of string definitions it needs anyway.
+
+--- tools/wml/wmldbcreate.c.orig	2017-08-17 00:38:43.000000000 +0000
++++ tools/wml/wmldbcreate.c
+@@ -84,6 +84,8 @@ static char rcsid[] = "$TOG: wmldbcreate
+ #include "UilSymChCl.h" /* from WML */
+ #include "UilSymChTa.h" /* from WML */
+ 
++#include "../../lib/Xm/XmStrDefs.c"
++
+ void emit_globals();
+ void emit_header(_db_header_ptr header);
+ void emit_chars(int	    table_id);