Index: head/devel/gdb/Makefile =================================================================== --- head/devel/gdb/Makefile (revision 493007) +++ head/devel/gdb/Makefile (revision 493008) @@ -1,158 +1,181 @@ # Created by: Steven Kreuzer # $FreeBSD$ PORTNAME= gdb PORTVERSION= 8.2.1 -PORTREVISION= 0 +PORTREVISION= 1 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 USE_PYTHON= flavors py3kplist 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-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-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:MPYTHON} .if ${PYTHON_VER} != ${PYTHON_DEFAULT} PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX} .endif .endif +.if ${PORT_OPTIONS:MPYTHON} && exists(/usr/lib/libc++.so.1) +USE_GITHUB= nodefault + +GH_ACCOUNT= bsdjhb:libcxx +GH_PROJECT= libcxx-gdbpy:libcxx +GH_TAGNAME= 99aae0c:libcxx + +# Workaround USE_GITHUB preventing the default DISTFILES +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} + +PLIST_SUB+= LIBCXX="" +.else +PLIST_SUB+= LIBCXX="@comment" +.endif + .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 ${CHOSEN_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/python/${f} ; ${CHMOD} 644 *.py* ) . endfor +.if exists(/usr/lib/libc++.so.1) + @(cd ${WRKSRC_libcxx} ; \ + ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} install ) + @(cd ${STAGEDIR}${PREFIX}/share/gdb/auto-load/usr/lib && \ + ${PYTHON_CMD} -m compileall .) + @(cd ${STAGEDIR}${PREFIX}/share/libcxx-gdbpy/libcxx && \ + ${PYTHON_CMD} -m compileall .) +.endif 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/distinfo =================================================================== --- head/devel/gdb/distinfo (revision 493007) +++ head/devel/gdb/distinfo (revision 493008) @@ -1,3 +1,5 @@ -TIMESTAMP = 1547729301 +TIMESTAMP = 1550011043 SHA256 (gdb-8.2.1.tar.xz) = 0a6a432907a03c5c8eaad3c3cffd50c00a40c3a5e3c4039440624bae703f2202 SIZE (gdb-8.2.1.tar.xz) = 20170388 +SHA256 (bsdjhb-libcxx-gdbpy-99aae0c_GH0.tar.gz) = 101425f8041489e31370ddd5938b41541b88a2e1051da70fe12d37c9186aa7eb +SIZE (bsdjhb-libcxx-gdbpy-99aae0c_GH0.tar.gz) = 4607 Index: head/devel/gdb/pkg-plist =================================================================== --- head/devel/gdb/pkg-plist (revision 493007) +++ head/devel/gdb/pkg-plist (revision 493008) @@ -1,84 +1,92 @@ %%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 +%%LIBCXX%%%%DATADIR%%/auto-load/usr/lib/libc++.so.1-gdb.py +%%LIBCXX%%%%DATADIR%%/auto-load/usr/lib/libc++.so.1-gdb.pyc %%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 +%%LIBCXX%%share/libcxx-gdbpy/libcxx/__init__.py +%%LIBCXX%%share/libcxx-gdbpy/libcxx/__init__.pyc +%%LIBCXX%%share/libcxx-gdbpy/libcxx/printers.py +%%LIBCXX%%share/libcxx-gdbpy/libcxx/printers.pyc +%%LIBCXX%%share/libcxx-gdbpy/libcxx/xmethods.py +%%LIBCXX%%share/libcxx-gdbpy/libcxx/xmethods.pyc