Index: head/devel/gdb/Makefile =================================================================== --- head/devel/gdb/Makefile (revision 487192) +++ head/devel/gdb/Makefile (revision 487193) @@ -1,147 +1,151 @@ # Created by: Steven Kreuzer # $FreeBSD$ PORTNAME= gdb PORTVERSION= 8.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= GNU MAINTAINER= pizzamig@FreeBSD.org COMMENT= GNU GDB of newer version than comes with the system LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING3 # untested on sparc64, might work ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 mips powerpc powerpc64 LIB_DEPENDS= libmpfr.so:math/mpfr TEST_DEPENDS= runtest:misc/dejagnu USES= compiler:c++11-lang cpe gmake libtool tar:xz TEST_TARGET= check USE_CSTD= gnu89 CPE_VENDOR= gnu GNU_CONFIGURE= yes CONFIGURE_ENV= CONFIGURED_M4=m4 CONFIGURED_BISON=byacc CONFIGURE_ARGS= --program-suffix=${PORTVERSION:S/.//g} \ --enable-targets=all --enable-64-bit-bfd \ - --with-gdb-datadir=${PREFIX}/share/gdb${PORTVERSION:S/.//g} \ --with-separate-debug-dir=/usr/lib/debug \ ${ICONV_CONFIGURE_ARG} \ --with-expat=yes --with-libexpat-prefix=${LOCALBASE} \ --without-libunwind-ia64 --with-system-zlib CFLAGS:= ${CFLAGS:C/ +$//} # blanks at EOL creep in sometimes CFLAGS+= -DRL_NO_COMPAT -Wno-unused-function -Wno-unused-variable CFLAGS+= -Wno-unknown-warning-option EXCLUDE= dejagnu expect sim texinfo intl EXTRACT_AFTER_ARGS= ${EXCLUDE:S/^/--exclude /} EXTRA_PATCHES= ${FILESDIR}/commit-8aa0243d54 \ - ${FILESDIR}/commit-93579f6f90 + ${FILESDIR}/commit-93579f6f90 \ + ${FILESDIR}/commit-2861ee4fde LIB_DEPENDS+= libexpat.so:textproc/expat2 VER= ${PORTVERSION:S/.//g} PLIST_SUB= VER=${VER} OPTIONS_DEFINE= DEBUG GDB_LINK GUILE KGDB NLS PYTHON TUI OPTIONS_DEFAULT= GDB_LINK KGDB NLS PYTHON TUI PORT_READLINE PORT_ICONV SYSTEM_ZLIB OPTIONS_SINGLE= READLINE ICONV ZLIB OPTIONS_SINGLE_READLINE= BUNDLED_READLINE PORT_READLINE OPTIONS_SINGLE_ICONV= PORT_ICONV SYSTEM_ICONV OPTIONS_SINGLE_ZLIB= BUNDLED_ZLIB SYSTEM_ZLIB GDB_LINK_DESC= Create ${PREFIX}/bin/gdb symlink KGDB_DESC= Kernel Debugging Support BUNDLED_READLINE_DESC= from gdb distfile BUNDLED_ZLIB_DESC= from gdb distfile PORT_READLINE_DESC= from devel/readline port PORT_ICONV_DESC= use libiconv, with wider charset support SYSTEM_ICONV_DESC= use libc iconv, with no wchar support SYSTEM_ZLIB_DESC= use system zlib TUI_DESC= Text User Interface enabled OPTIONS_SUB= yes BUNDLED_READLINE_CONFIGURE_OFF= --with-system-readline DEBUG_CFLAGS= -g GUILE_CONFIGURE_WITH= guile GUILE_USES= pkgconfig GUILE_LIB_DEPENDS= libguile-2.0.so:lang/guile2 NLS_USES= gettext-runtime PORT_READLINE_USES= readline:port PORT_ICONV_USES= iconv:wchar_t PYTHON_CONFIGURE_ON= --with-python=${PYTHON_CMD} PYTHON_CONFIGURE_OFF= --without-python PYTHON_USES= python SYSTEM_ICONV_USES= iconv SYSTEM_ZLIB_WITH= system-zlib TUI_CONFIGURE_ENABLE= tui .include .if ! ${PORT_OPTIONS:MBUNDLED_READLINE} EXCLUDE+= readline .endif .if ! ${PORT_OPTIONS:MBUNDLED_ZLIB} EXCLUDE+= zlib .endif .if ${ARCH} == "amd64" CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL} .endif .if ${COMPILER_TYPE} == "clang" CFLAGS+= -Wno-extended-offsetof .endif post-patch: @${REINPLACE_CMD} -e 's|$$| [GDB v${PORTVERSION} for FreeBSD]|' \ ${WRKSRC}/gdb/version.in post-patch-KGDB-on: @${CP} -r ${FILESDIR}/kgdb/*.[ch] ${WRKSRC}/gdb/ @${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} < ${FILESDIR}/extrapatch-kgdb do-install: ${INSTALL_PROGRAM} ${WRKSRC}/gdb/gdb \ ${STAGEDIR}${PREFIX}/bin/gdb${VER} ${INSTALL_MAN} ${WRKSRC}/gdb/doc/gdb.1 \ ${STAGEDIR}${MAN1PREFIX}/man/man1/gdb${VER}.1 (cd ${WRKSRC}/gdb/data-directory ; \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-syscalls ) do-install-KGDB-on: ${INSTALL_PROGRAM} ${WRKSRC}/gdb/kgdb \ ${STAGEDIR}${PREFIX}/bin/kgdb${VER} ${INSTALL_MAN} ${FILESDIR}/kgdb/kgdb.1 \ ${STAGEDIR}${MAN1PREFIX}/man/man1/kgdb${VER}.1 do-install-TUI-on: ${LN} -sf gdb${VER} ${STAGEDIR}${PREFIX}/bin/gdbtui${VER} do-install-GDB_LINK-on: ${LN} -sf gdb${VER} ${STAGEDIR}${PREFIX}/bin/gdb + ${LN} -sf gdb${VER}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/gdb.1 .if ${PORT_OPTIONS:MKGDB} ${LN} -sf kgdb${VER} ${STAGEDIR}${PREFIX}/bin/kgdb + ${LN} -sf kgdb${VER}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/kgdb.1 .endif do-install-PYTHON-on: (cd ${WRKSRC}/gdb; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-python ) (cd ${WRKSRC}/gdb/data-directory ; \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-python ) + @(cd ${STAGEDIR}${PREFIX}/share/gdb/python && \ + ${PYTHON_CMD} -m compileall .) . for f in gdb gdb/command gdb/function gdb/printer - @(cd ${STAGEDIR}${PREFIX}/share/gdb${VER}/python/${f} ; ${CHMOD} 644 *.py* ) + @(cd ${STAGEDIR}${PREFIX}/share/gdb/python/${f} ; ${CHMOD} 644 *.py* ) . endfor do-install-GUILE-on: (cd ${WRKSRC}/gdb; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-guile ) (cd ${WRKSRC}/gdb/data-directory ; \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-guile ) .include Index: head/devel/gdb/files/commit-2861ee4fde =================================================================== --- head/devel/gdb/files/commit-2861ee4fde (nonexistent) +++ head/devel/gdb/files/commit-2861ee4fde (revision 487193) @@ -0,0 +1,63 @@ +commit 2861ee4fde97d0afafc506380c5deaf71c8439ac +Author: John Baldwin +Date: Wed Dec 5 10:51:16 2018 -0800 + + Use separate sed expressions to escape auto-load directories. + + Not all sed implementations support alternation via \| in the default + regular expressions. Instead, resort to separate sed expressions via + -e for $debugdir and $datadir. This fixes the default setting of the + auto-load directories on FreeBSD. Previously on FreeBSD the sed + invocation was a no-op causing the debugdir and datadir values to be + expanded yielding an autoload path of ':${prefix}/share/gdb'. + + gdb/ChangeLog: + + * configure: Re-generate. + * configure.ac: Use separate sed expressions to escape variables + in auto-load directories. + +diff --git gdb/configure gdb/configure +index 7665ba6531..3777230898 100755 +--- gdb/configure ++++ gdb/configure +@@ -6579,7 +6579,7 @@ else + with_auto_load_dir='$debugdir:$datadir/auto-load' + fi + +-escape_dir=`echo $with_auto_load_dir | sed 's/[$]\(datadir\|debugdir\)\>/\\\\\\\\\\\\&/g'` ++escape_dir=`echo $with_auto_load_dir | sed -e 's/[$]datadir\>/\\\\\\\\\\\\&/g' -e 's/[$]debugdir\>/\\\\\\\\\\\\&/g'` + + test "x$prefix" = xNONE && prefix="$ac_default_prefix" + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +@@ -6606,7 +6606,7 @@ else + with_auto_load_safe_path="$with_auto_load_dir" + fi + +-escape_dir=`echo $with_auto_load_safe_path | sed 's/[$]\(datadir\|debugdir\)\>/\\\\\\\\\\\\&/g'` ++escape_dir=`echo $with_auto_load_safe_path | sed -e 's/[$]datadir\>/\\\\\\\\\\\\&/g' -e 's/[$]debugdir\>/\\\\\\\\\\\\&/g'` + + test "x$prefix" = xNONE && prefix="$ac_default_prefix" + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +diff --git gdb/configure.ac gdb/configure.ac +index e1ea60660b..eca7ea6d41 100644 +--- gdb/configure.ac ++++ gdb/configure.ac +@@ -146,7 +146,7 @@ AC_ARG_WITH(auto-load-dir, + AS_HELP_STRING([--with-auto-load-dir=PATH], + [directories from which to load auto-loaded scripts @<:@$debugdir:$datadir/auto-load@:>@]),, + [with_auto_load_dir='$debugdir:$datadir/auto-load']) +-escape_dir=`echo $with_auto_load_dir | sed 's/[[$]]\(datadir\|debugdir\)\>/\\\\\\\\\\\\&/g'` ++escape_dir=`echo $with_auto_load_dir | sed -e 's/[[$]]datadir\>/\\\\\\\\\\\\&/g' -e 's/[[$]]debugdir\>/\\\\\\\\\\\\&/g'` + AC_DEFINE_DIR(AUTO_LOAD_DIR, escape_dir, + [Directories from which to load auto-loaded scripts.]) + AC_MSG_RESULT([$with_auto_load_dir]) +@@ -161,7 +161,7 @@ AS_HELP_STRING([--without-auto-load-safe-path], + with_auto_load_safe_path="/" + fi], + [with_auto_load_safe_path="$with_auto_load_dir"]) +-escape_dir=`echo $with_auto_load_safe_path | sed 's/[[$]]\(datadir\|debugdir\)\>/\\\\\\\\\\\\&/g'` ++escape_dir=`echo $with_auto_load_safe_path | sed -e 's/[[$]]datadir\>/\\\\\\\\\\\\&/g' -e 's/[[$]]debugdir\>/\\\\\\\\\\\\&/g'` + AC_DEFINE_DIR(AUTO_LOAD_SAFE_PATH, escape_dir, + [Directories safe to hold auto-loaded files.]) + AC_MSG_RESULT([$with_auto_load_safe_path]) Property changes on: head/devel/gdb/files/commit-2861ee4fde ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/gdb/pkg-plist =================================================================== --- head/devel/gdb/pkg-plist (revision 487192) +++ head/devel/gdb/pkg-plist (revision 487193) @@ -1,59 +1,84 @@ %%GDB_LINK%%bin/gdb %%GDB_LINK%%%%KGDB%%bin/kgdb bin/gdb%%VER%% %%TUI%%bin/gdbtui%%VER%% %%KGDB%%bin/kgdb%%VER%% +%%GDB_LINK%%man/man1/gdb.1.gz man/man1/gdb%%VER%%.1.gz +%%GDB_LINK%%%%KGDB%%man/man1/kgdb.1.gz %%KGDB%%man/man1/kgdb%%VER%%.1.gz -%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/__init__.py -%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/FrameDecorator.py -%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/FrameIterator.py -%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/frames.py -%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/printing.py -%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/prompt.py -%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/types.py -%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/unwinder.py -%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/xmethod.py -%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/__init__.py -%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/explore.py -%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/frame_filters.py -%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/pretty_printers.py -%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/prompt.py -%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/type_printers.py -%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/unwinders.py -%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/command/xmethods.py -%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/function/__init__.py -%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/function/as_string.py -%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/function/caller_is.py -%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/function/strfns.py -%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/printer/__init__.py -%%PYTHON%%%%DATADIR%%%%VER%%/python/gdb/printer/bound_registers.py -%%GUILE%%%%DATADIR%%%%VER%%/guile/gdb.go -%%GUILE%%%%DATADIR%%%%VER%%/guile/gdb.scm -%%GUILE%%%%DATADIR%%%%VER%%/guile/gdb/boot.scm -%%GUILE%%%%DATADIR%%%%VER%%/guile/gdb/experimental.go -%%GUILE%%%%DATADIR%%%%VER%%/guile/gdb/experimental.scm -%%GUILE%%%%DATADIR%%%%VER%%/guile/gdb/init.scm -%%GUILE%%%%DATADIR%%%%VER%%/guile/gdb/iterator.go -%%GUILE%%%%DATADIR%%%%VER%%/guile/gdb/iterator.scm -%%GUILE%%%%DATADIR%%%%VER%%/guile/gdb/printing.go -%%GUILE%%%%DATADIR%%%%VER%%/guile/gdb/printing.scm -%%GUILE%%%%DATADIR%%%%VER%%/guile/gdb/support.go -%%GUILE%%%%DATADIR%%%%VER%%/guile/gdb/support.scm -%%GUILE%%%%DATADIR%%%%VER%%/guile/gdb/types.go -%%GUILE%%%%DATADIR%%%%VER%%/guile/gdb/types.scm -%%DATADIR%%%%VER%%/syscalls/aarch64-linux.xml -%%DATADIR%%%%VER%%/syscalls/amd64-linux.xml -%%DATADIR%%%%VER%%/syscalls/arm-linux.xml -%%DATADIR%%%%VER%%/syscalls/freebsd.xml -%%DATADIR%%%%VER%%/syscalls/gdb-syscalls.dtd -%%DATADIR%%%%VER%%/syscalls/i386-linux.xml -%%DATADIR%%%%VER%%/syscalls/mips-n32-linux.xml -%%DATADIR%%%%VER%%/syscalls/mips-n64-linux.xml -%%DATADIR%%%%VER%%/syscalls/mips-o32-linux.xml -%%DATADIR%%%%VER%%/syscalls/ppc-linux.xml -%%DATADIR%%%%VER%%/syscalls/ppc64-linux.xml -%%DATADIR%%%%VER%%/syscalls/s390-linux.xml -%%DATADIR%%%%VER%%/syscalls/s390x-linux.xml -%%DATADIR%%%%VER%%/syscalls/sparc-linux.xml -%%DATADIR%%%%VER%%/syscalls/sparc64-linux.xml +%%PYTHON%%%%DATADIR%%/python/gdb/__init__.py +%%PYTHON%%%%DATADIR%%/python/gdb/__init__.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/FrameDecorator.py +%%PYTHON%%%%DATADIR%%/python/gdb/FrameDecorator.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/FrameIterator.py +%%PYTHON%%%%DATADIR%%/python/gdb/FrameIterator.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/frames.py +%%PYTHON%%%%DATADIR%%/python/gdb/frames.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/printing.py +%%PYTHON%%%%DATADIR%%/python/gdb/prompt.py +%%PYTHON%%%%DATADIR%%/python/gdb/prompt.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/printing.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/types.py +%%PYTHON%%%%DATADIR%%/python/gdb/types.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/unwinder.py +%%PYTHON%%%%DATADIR%%/python/gdb/unwinder.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/xmethod.py +%%PYTHON%%%%DATADIR%%/python/gdb/xmethod.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/command/__init__.py +%%PYTHON%%%%DATADIR%%/python/gdb/command/__init__.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/command/explore.py +%%PYTHON%%%%DATADIR%%/python/gdb/command/explore.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/command/frame_filters.py +%%PYTHON%%%%DATADIR%%/python/gdb/command/frame_filters.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/command/pretty_printers.py +%%PYTHON%%%%DATADIR%%/python/gdb/command/pretty_printers.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/command/prompt.py +%%PYTHON%%%%DATADIR%%/python/gdb/command/prompt.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/command/type_printers.py +%%PYTHON%%%%DATADIR%%/python/gdb/command/type_printers.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/command/unwinders.py +%%PYTHON%%%%DATADIR%%/python/gdb/command/unwinders.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/command/xmethods.py +%%PYTHON%%%%DATADIR%%/python/gdb/command/xmethods.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/function/__init__.py +%%PYTHON%%%%DATADIR%%/python/gdb/function/__init__.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/function/as_string.py +%%PYTHON%%%%DATADIR%%/python/gdb/function/as_string.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/function/caller_is.py +%%PYTHON%%%%DATADIR%%/python/gdb/function/caller_is.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/function/strfns.py +%%PYTHON%%%%DATADIR%%/python/gdb/function/strfns.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/printer/__init__.py +%%PYTHON%%%%DATADIR%%/python/gdb/printer/__init__.pyc +%%PYTHON%%%%DATADIR%%/python/gdb/printer/bound_registers.py +%%PYTHON%%%%DATADIR%%/python/gdb/printer/bound_registers.pyc +%%GUILE%%%%DATADIR%%/guile/gdb.go +%%GUILE%%%%DATADIR%%/guile/gdb.scm +%%GUILE%%%%DATADIR%%/guile/gdb/boot.scm +%%GUILE%%%%DATADIR%%/guile/gdb/experimental.go +%%GUILE%%%%DATADIR%%/guile/gdb/experimental.scm +%%GUILE%%%%DATADIR%%/guile/gdb/init.scm +%%GUILE%%%%DATADIR%%/guile/gdb/iterator.go +%%GUILE%%%%DATADIR%%/guile/gdb/iterator.scm +%%GUILE%%%%DATADIR%%/guile/gdb/printing.go +%%GUILE%%%%DATADIR%%/guile/gdb/printing.scm +%%GUILE%%%%DATADIR%%/guile/gdb/support.go +%%GUILE%%%%DATADIR%%/guile/gdb/support.scm +%%GUILE%%%%DATADIR%%/guile/gdb/types.go +%%GUILE%%%%DATADIR%%/guile/gdb/types.scm +%%DATADIR%%/syscalls/aarch64-linux.xml +%%DATADIR%%/syscalls/amd64-linux.xml +%%DATADIR%%/syscalls/arm-linux.xml +%%DATADIR%%/syscalls/freebsd.xml +%%DATADIR%%/syscalls/gdb-syscalls.dtd +%%DATADIR%%/syscalls/i386-linux.xml +%%DATADIR%%/syscalls/mips-n32-linux.xml +%%DATADIR%%/syscalls/mips-n64-linux.xml +%%DATADIR%%/syscalls/mips-o32-linux.xml +%%DATADIR%%/syscalls/ppc-linux.xml +%%DATADIR%%/syscalls/ppc64-linux.xml +%%DATADIR%%/syscalls/s390-linux.xml +%%DATADIR%%/syscalls/s390x-linux.xml +%%DATADIR%%/syscalls/sparc-linux.xml +%%DATADIR%%/syscalls/sparc64-linux.xml