pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

libproxy: fix dependency loop



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By:	wiz
Date:		Sun May 21 23:25:28 2023 +0200
Changeset:	d21f6b3411af4c2f96b12cd4db0c89acd9a80274

Modified Files:
	libproxy/Makefile
Removed Files:
	libproxy/TODO

Log Message:
libproxy: fix dependency loop

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d21f6b3411af4c2f96b12cd4db0c89acd9a80274

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libproxy/Makefile | 7 ++++++-
 libproxy/TODO     | 3 ---
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs:
diff --git a/libproxy/Makefile b/libproxy/Makefile
index 911c60d1cf..7dc3efc40e 100644
--- a/libproxy/Makefile
+++ b/libproxy/Makefile
@@ -22,6 +22,9 @@ REPLACE_BASH+=	data/check-code-style
 REPLACE_BASH+=	data/install-git-hook.sh
 REPLACE_BASH+=	data/pre-commit-hook
 
+# see libsoup comment below
+MESON_ARGS+=	-Dtests=false
+
 .include "../../devel/meson/build.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
@@ -29,7 +32,9 @@ REPLACE_BASH+=	data/pre-commit-hook
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/libduktape/buildlink3.mk"
 .include "../../lang/vala/buildlink3.mk"
-.include "../../net/libsoup3/buildlink3.mk"
+# needed for tests, but causes dependency loop via
+# libsoup3 -> glib-networking -> libproxy
+#.include "../../net/libsoup3/buildlink3.mk"
 .include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
diff --git a/libproxy/TODO b/libproxy/TODO
deleted file mode 100644
index a299a0266c..0000000000
--- a/libproxy/TODO
+++ /dev/null
@@ -1,3 +0,0 @@
-Dependency loop: libproxy -> libsoup -> glib-networking -> libproxy
-
-https://github.com/libproxy/libproxy/issues/225


Home | Main Index | Thread Index | Old Index