Module Name: src
Committed By: rin
Date: Sun Aug 18 03:47:56 UTC 2024
Modified Files:
src/tools/gdb: Makefile mknative-gdb
Log Message:
mknative-gdb: Generate *.info by using makeinfo(1) from pkgsrc
Unfortunately, our in-tree makeinfo(1) (latest GPLv2 version) is
too old for this purpose :(
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/tools/gdb/Makefile
cvs rdiff -u -r1.16 -r1.17 src/tools/gdb/mknative-gdb
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gdb/Makefile
diff -u src/tools/gdb/Makefile:1.50 src/tools/gdb/Makefile:1.51
--- src/tools/gdb/Makefile:1.50 Wed Aug 14 23:56:19 2024
+++ src/tools/gdb/Makefile Sun Aug 18 03:47:55 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2024/08/14 23:56:19 christos Exp $
+# $NetBSD: Makefile,v 1.51 2024/08/18 03:47:55 rin Exp $
.include <bsd.hostinit.mk>
@@ -19,7 +19,13 @@ CONFIGURE_ARGS= --target=${MACHINE_GNU_P
CONFIGURE_ARGS+=--enable-obsolete
.endif
-MAKE_ARGS= MACHINE= MAKEINFO=${TOOL_MAKEINFO:Q}
+# XXX
+# Unfortunately, our in-tree makeinfo(1) (latest GPLv2 release) is
+# too old to generate *.info. Use external tool from pkgsrc.
+EXTERN_MAKEINFO?= /usr/pkg/bin/makeinfo
+MAKEINFOFLAGS?= --no-split
+
+MAKE_ARGS= MACHINE=
ALL_TARGET= all-gdb
INSTALL_TARGET= install-gdb
@@ -48,6 +54,8 @@ MKNATIVE_ENV= ${BINENV} ${CONFIGURE_ENV:
NM=${NM:Q} OBJDUMP=${OBJDUMP:Q} \
XGETTEXT=${TOOLDIR}/bin/${_TOOL_PREFIX}xgettext \
LIBS=-lintl \
+ MAKEINFO=${EXTERN_MAKEINFO} \
+ MAKEINFOFLAGS=${MAKEINFOFLAGS} \
${MKNATIVE_CONFIGURE_PRESET}
MKENV_BUILD_MAKE=${MKNATIVE_ENV} ${BUILD_MAKE}
@@ -148,7 +156,9 @@ native-gdb: .native/.configure_done
${MKENV_BUILD_MAKE} backtrace-supported.h) && \
(if [ -d ${.OBJDIR}/.native/gdbserver ]; then \
cd ${.OBJDIR}/.native/gdbserver && \
- ${MKENV_BUILD_MAKE} version-generated.cc; fi)
+ ${MKENV_BUILD_MAKE} version-generated.cc; fi) && \
+ (cd ${.OBJDIR}/.native/gdb/doc && \
+ ${MKENV_BUILD_MAKE} info)
@touch $@
clean: clean.native
Index: src/tools/gdb/mknative-gdb
diff -u src/tools/gdb/mknative-gdb:1.16 src/tools/gdb/mknative-gdb:1.17
--- src/tools/gdb/mknative-gdb:1.16 Mon Jul 31 17:09:59 2023
+++ src/tools/gdb/mknative-gdb Sun Aug 18 03:47:55 2024
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gdb,v 1.16 2023/07/31 17:09:59 christos Exp $
+# $NetBSD: mknative-gdb,v 1.17 2024/08/18 03:47:55 rin Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of src/external/gpl3/gdb
@@ -262,6 +262,20 @@ get_gdb_bingdbserver () {
<$_TMPDIR/gdbserver/version-generated.cc
}
+# info
+
+get_gdb_info () {
+ local _INFO=$_GDB/info
+ local _SRC=$_TMPDIR/gdb/doc
+
+ mkdir -p $_TOP/$_INFO
+
+ for i in $_SRC/*.info; do
+ j=`basename $i`
+ writefile $_INFO/$j < $i
+ done
+}
+
##### main #####
case $1 in
@@ -278,6 +292,7 @@ all|gdb) # everything (uses "canadian cr
get_gdb_libreadline
get_gdb_libdecnumber
get_gdb_bingdbserver
+ get_gdb_info
exit 0
;;
