diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile
index 571e3b460996..66ae1ce8316a 100644
--- a/devel/gdb/Makefile
+++ b/devel/gdb/Makefile
@@ -1,180 +1,189 @@
# Created by: Steven Kreuzer <skreuzer@FreeBSD.org>
PORTNAME= gdb
DISTVERSION= 11.2
PORTREVISION= 0
CATEGORIES= devel
MASTER_SITES= GNU
MAINTAINER= pizzamig@FreeBSD.org
COMMENT= GNU Project Debugger
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING3
# untested on sparc64, might work
NOT_FOR_ARCHS= sparc64
LIB_DEPENDS= libgmp.so:math/gmp \
libmpfr.so:math/mpfr
TEST_DEPENDS= runtest:misc/dejagnu
USES= compiler:c++11-lang cpe gmake libtool makeinfo pkgconfig tar:xz
USE_PYTHON= flavors py3kplist
TEST_TARGET= check
CPE_VENDOR= gnu
GNU_CONFIGURE= yes
CONFIGURE_ENV= CONFIGURED_M4=m4 CONFIGURED_BISON=byacc
CONFIGURE_ARGS= --program-suffix=${DISTVERSION: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
CONFIGURE_OUTSOURCE= yes
CFLAGS:= ${CFLAGS:C/ +$//} # blanks at EOL creep in sometimes
CFLAGS+= -DRL_NO_COMPAT
EXCLUDE= dejagnu expect sim texinfo intl
EXTRACT_AFTER_ARGS= ${EXCLUDE:S/^/--exclude /}
LIB_DEPENDS+= libexpat.so:textproc/expat2
VER= ${DISTVERSION:S/.//g}
PLIST_SUB= VER=${VER}
OPTIONS_DEFINE= DEBUG GDB_LINK GUILE KGDB NLS PYTHON SOURCE_HIGHLIGHT TUI
OPTIONS_DEFAULT= GDB_LINK KGDB NLS PYTHON SOURCE_HIGHLIGHT TUI
OPTIONS_DEFAULT+= 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
SOURCE_HIGHLIGHT_DESC= Source Code Styling
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
DEBUG_VARS= STRIP=
GUILE_CONFIGURE_WITH= guile
GUILE_LIB_DEPENDS= libguile-2.2.so:lang/guile2
NLS_USES= gettext-runtime
PORT_READLINE_USES= readline
PORT_ICONV_USES= iconv:wchar_t
PYTHON_CONFIGURE_ON= --with-python=${PYTHON_CMD}
PYTHON_CONFIGURE_OFF= --without-python
PYTHON_USES= python:3.6+
SOURCE_HIGHLIGHT_WITH= source-highlight
SOURCE_HIGHLIGHT_LIB_DEPENDS= \
libsource-highlight.so:textproc/source-highlight
SYSTEM_ICONV_USES= iconv
SYSTEM_ZLIB_WITH= system-zlib
TUI_CONFIGURE_ENABLE= tui
.include <bsd.port.pre.mk>
.if ${PORT_OPTIONS:MPYTHON}
.if ${PYTHON_VER} != ${PYTHON_DEFAULT}
PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX}
.endif
.endif
-.if ${PORT_OPTIONS:MPYTHON} && exists(/usr/lib/libc++.so.1)
+.if ${PORT_OPTIONS:MPYTHON} && \
+ (exists(/usr/lib/libc++.so.1) || exists(/lib/libc++.so.1))
USE_GITHUB= nodefault
GH_ACCOUNT= bsdjhb:libcxx
GH_PROJECT= libcxx-gdbpy:libcxx
GH_TAGNAME= 03d0d9b:libcxx
# Workaround USE_GITHUB preventing the default DISTFILES
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
+.if exists(/usr/lib/libc++.so.1)
+LIBCXX_DIR= /usr/lib
+.else
+LIBCXX_DIR= /lib
+.endif
+
+PLIST_SUB+= LIBCXX_DIR="${LIBCXX_DIR}"
PLIST_SUB+= LIBCXX=""
.else
PLIST_SUB+= LIBCXX="@comment "
.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${DISTVERSION} 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} ${INSTALL_WRKSRC}/gdb/gdb \
${STAGEDIR}${PREFIX}/bin/gdb${VER}
${INSTALL_MAN} ${WRKSRC}/gdb/doc/gdb.1 \
${STAGEDIR}${MAN1PREFIX}/man/man1/gdb${VER}.1
(cd ${INSTALL_WRKSRC}/gdb/data-directory ; \
${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-syscalls )
do-install-KGDB-on:
${INSTALL_PROGRAM} ${INSTALL_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 ${INSTALL_WRKSRC}/gdb ; \
${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-python )
(cd ${INSTALL_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)
+.if exists(/usr/lib/libc++.so.1) || exists(/lib/libc++.so.1)
@(cd ${WRKSRC_libcxx} ; \
- ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} install )
- @(cd ${STAGEDIR}${PREFIX}/share/gdb/auto-load/usr/lib && \
+ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} \
+ LIBCXX_DIR="${LIBCXX_DIR}" install )
+ @(cd ${STAGEDIR}${PREFIX}/share/gdb/auto-load/${LIBCXX_DIR} && \
${PYTHON_CMD} -m compileall .)
@(cd ${STAGEDIR}${PREFIX}/share/libcxx-gdbpy/libcxx && \
${PYTHON_CMD} -m compileall .)
.endif
do-install-GUILE-on:
(cd ${INSTALL_WRKSRC}/gdb ; \
${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-guile )
(cd ${INSTALL_WRKSRC}/gdb/data-directory ; \
${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-guile )
.include <bsd.port.post.mk>
diff --git a/devel/gdb/pkg-plist b/devel/gdb/pkg-plist
index 653d280c5b1a..4efe03c46e1a 100644
--- a/devel/gdb/pkg-plist
+++ b/devel/gdb/pkg-plist
@@ -1,93 +1,93 @@
%%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
+%%LIBCXX%%%%DATADIR%%/auto-load%%LIBCXX_DIR%%/libc++.so.1-gdb.py
+%%LIBCXX%%%%DATADIR%%/auto-load%%LIBCXX_DIR%%/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/netbsd.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