On 2020/12/09 22:10, Solene Rapenne wrote:
> I propose the following change to x11/gnustep/projectcenter
>
> someone on IRC reported a problem that using gnustep environment
> was pulling in devel/gdb as a RUN_DEP of x11/gnustep/projectcenter,
> which stricly speaking isn't absolutely required to use projectcenter.
> gdb conflicts with devel/arm-none-eabi/gdb
>
> So you can't use gnustep and arm-none-eabi-gdb at the same time because
> of gdb conflict.
>
> I don't know if it's a smart change, because a projectcenter user
> may forget to install gdb package. At the same time,
> x11/gnustep/projectcenter has a patch to give egdb full path.
>
> What do you think about it?
Can we get rid of the conflicts? gdb is not really an optional package
in many situations - the version of gdb in base is unusable for most
software.
$ comm devel/gdb/pkg/PLIST devel/arm-none-eabi/gdb/pkg/PLIST |grep '^
'
include/gdb/
include/gdb/jit-reader.h
share/gdb/
share/gdb/system-gdbinit/
share/gdb/system-gdbinit/elinos.py
share/gdb/system-gdbinit/wrs-linux.py
The only thing different between the files in gdb and arm-none-eabi-gdb
are the copyright dates, and they aren't usually needed to run gdb
anyway.
I propose this instead:
Index: gdb/Makefile
===================================================================
RCS file: /cvs/ports/devel/gdb/Makefile,v
retrieving revision 1.68
diff -u -p -r1.68 Makefile
--- gdb/Makefile 18 Oct 2020 18:49:10 -0000 1.68
+++ gdb/Makefile 9 Dec 2020 21:21:51 -0000
@@ -4,7 +4,7 @@ COMMENT= GNU debugger
CATEGORIES= devel
DISTNAME= gdb-7.12.1
-REVISION= 13
+REVISION= 14
HOMEPAGE= https://www.gnu.org/software/gdb/
Index: gdb/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/gdb/pkg/PLIST,v
retrieving revision 1.21
diff -u -p -r1.21 PLIST
--- gdb/pkg/PLIST 29 Mar 2020 14:47:52 -0000 1.21
+++ gdb/pkg/PLIST 9 Dec 2020 21:21:51 -0000
@@ -1,5 +1,4 @@
@comment $OpenBSD: PLIST,v 1.21 2020/03/29 14:47:52 kn Exp $
-@conflict arm-none-eabi-gdb-*
@conflict libbfd-*
@bin bin/egdb
include/ansidecl.h
Index: arm-none-eabi/gdb/Makefile
===================================================================
RCS file: /cvs/ports/devel/arm-none-eabi/gdb/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- arm-none-eabi/gdb/Makefile 16 Jul 2019 21:29:41 -0000 1.7
+++ arm-none-eabi/gdb/Makefile 9 Dec 2020 21:21:51 -0000
@@ -4,7 +4,7 @@ COMMENT= gdb for arm-none-eabi cross-dev
DISTNAME= gdb-7.9.1
EXTRACT_SUFX= .tar.xz
-REVISION= 4
+REVISION= 5
HOMEPAGE= https://www.gnu.org/software/gdb/
@@ -25,9 +25,5 @@ CONFIGURE_ARGS+= --enable-multilib \
MODULES= lang/python
TEST_DEPENDS=devel/dejagnu
-
-post-install:
- ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
- ${PREFIX}/share/gdb/system-gdbinit
.include <bsd.port.mk>
Index: arm-none-eabi/gdb/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/arm-none-eabi/gdb/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- arm-none-eabi/gdb/pkg/PLIST 10 Jun 2015 10:55:10 -0000 1.2
+++ arm-none-eabi/gdb/pkg/PLIST 9 Dec 2020 21:21:51 -0000
@@ -1,9 +1,8 @@
@comment $OpenBSD: PLIST,v 1.2 2015/06/10 10:55:10 espie Exp $
-@conflict gdb-*
@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
OK?
> Index: Makefile
> ===================================================================
> RCS file: /home/reposync/ports/x11/gnustep/projectcenter/Makefile,v
> retrieving revision 1.23
> diff -u -p -r1.23 Makefile
> --- Makefile 16 Aug 2020 20:35:20 -0000 1.23
> +++ Makefile 9 Dec 2020 21:05:52 -0000
> @@ -3,7 +3,7 @@
> COMMENT= GNUstep integrated development environment
>
> VERSION = 0.6.2
> -REVISION = 9
> +REVISION = 10
> DISTNAME= ProjectCenter-${VERSION}
> CATEGORIES= devel
>
> @@ -12,7 +12,7 @@ MASTER_SITES= http://ftp.gnustep.org/pub
>
> SHARED_LIBS= ProjectCenter 1.1
>
> -RUN_DEPENDS += devel/gmake devel/gdb
> +RUN_DEPENDS += devel/gmake
> MODULES= x11/gnustep
> WANTLIB += util
> WANTLIB += ${COMPILER_LIBCXX}
>
