cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

de-conflict gdb and arm-none-eabi-gdb. the conflicting files are

Browse Source 
include/gdb/jit-reader.h
share/gdb/system-gdbinit/elinos.py
share/gdb/system-gdbinit/wrs-linux.py

these are not needed in most cases, and near identical between gdb and
arm-none-eabi-gdb (only difference is the copyright date), so having just
one copy is good enough.

remove old libbfd @conflict from gdb/pkg/PLIST while there (the libbfd
port was removed in 2011) noticed by solene@.

prompted by a suggestion from solene@ to remove the gdb dependency from
gnustep/projectcenter, looks fine to her.
This commit is contained in:
sthen 2020-12-09 21:41:43 +00:00
parent d363e520fc
commit 8012ed6dd3
4 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devel/arm-none-eabi/gdb/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.7 2019/07/16 21:29:41 sthen Exp $
# $OpenBSD: Makefile,v 1.8 2020/12/09 21:41:43 sthen Exp $
COMMENT= gdb for arm-none-eabi cross-development
DISTNAME= gdb-7.9.1
EXTRACT_SUFX= .tar.xz
REVISION= 4
REVISION= 5
HOMEPAGE= https://www.gnu.org/software/gdb/
@ -26,8 +26,4 @@ MODULES= lang/python
TEST_DEPENDS=devel/dejagnu
post-install:
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
${PREFIX}/share/gdb/system-gdbinit
.include <bsd.port.mk>

15
devel/arm-none-eabi/gdb/pkg/PLIST
View File

@ -1,9 +1,8 @@
@comment $OpenBSD: PLIST,v 1.2 2015/06/10 10:55:10 espie Exp $
@conflict gdb-*
@comment $OpenBSD: PLIST,v 1.3 2020/12/09 21:41:43 sthen Exp $
@bin bin/arm-none-eabi-gdb
@bin bin/arm-none-eabi-run
include/gdb/
include/gdb/jit-reader.h
@comment include/gdb/
@comment include/gdb/jit-reader.h
@comment lib/charset.alias
lib/libarm-none-eabi-sim.a
@man man/man1/arm-none-eabi-gdb.1
@ -25,8 +24,6 @@ share/gdb/
@comment share/gdb/syscalls/s390x-linux.xml
@comment share/gdb/syscalls/sparc-linux.xml
@comment share/gdb/syscalls/sparc64-linux.xml
share/gdb/system-gdbinit/
share/gdb/system-gdbinit/elinos.py
share/gdb/system-gdbinit/elinos.pyc
share/gdb/system-gdbinit/wrs-linux.py
share/gdb/system-gdbinit/wrs-linux.pyc
@comment share/gdb/system-gdbinit/
@comment share/gdb/system-gdbinit/elinos.py
@comment share/gdb/system-gdbinit/wrs-linux.py

4
devel/gdb/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.68 2020/10/18 18:49:10 kettenis Exp $
# $OpenBSD: Makefile,v 1.69 2020/12/09 21:41:43 sthen Exp $
COMMENT= GNU debugger
CATEGORIES= devel
DISTNAME= gdb-7.12.1
REVISION= 13
REVISION= 14
HOMEPAGE= https://www.gnu.org/software/gdb/

4
devel/gdb/pkg/PLIST
View File

@ -1,6 +1,4 @@
@comment $OpenBSD: PLIST,v 1.21 2020/03/29 14:47:52 kn Exp $
@conflict arm-none-eabi-gdb-*
@conflict libbfd-*
@comment $OpenBSD: PLIST,v 1.22 2020/12/09 21:41:43 sthen Exp $
@bin bin/egdb
include/ansidecl.h
include/bfd.h