From edba1794974a3775bcbfba62de6c052cd8b283ee Mon Sep 17 00:00:00 2001 From: Christian Prochaska Date: Mon, 12 Feb 2024 15:26:14 +0100 Subject: [PATCH] qt5: fix debug link creation Fixes #5116 --- repos/libports/lib/mk/qt5_base.mk | 2 +- repos/libports/lib/mk/qt5_declarative.mk | 2 +- repos/libports/lib/mk/qt5_graphicaleffects.mk | 2 +- repos/libports/lib/mk/qt5_quickcontrols.mk | 2 +- repos/libports/lib/mk/qt5_quickcontrols2.mk | 2 +- repos/libports/lib/mk/qt5_svg.mk | 2 +- repos/libports/lib/mk/qt5_virtualkeyboard.mk | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/repos/libports/lib/mk/qt5_base.mk b/repos/libports/lib/mk/qt5_base.mk index c139f0df97..6fced8df3b 100644 --- a/repos/libports/lib/mk/qt5_base.mk +++ b/repos/libports/lib/mk/qt5_base.mk @@ -63,7 +63,7 @@ built.tag: qmake_prepared.tag qmake_root/lib/ld.lib.so cd $(CURDIR)/install/qt/$$(dirname $${LIB}) && \ $(OBJCOPY) --only-keep-debug $$(basename $${LIB}) $$(basename $${LIB}).debug && \ $(STRIP) $$(basename $${LIB}) -o $$(basename $${LIB}).stripped && \ - $(OBJCOPY) --add-gnu-debuglink=$$(basename $${LIB}).debug $$(basename $${LIB}); \ + $(OBJCOPY) --add-gnu-debuglink=$$(basename $${LIB}).debug $$(basename $${LIB}).stripped; \ ln -sf $(CURDIR)/install/qt/$${LIB}.stripped $(PWD)/bin/$$(basename $${LIB}); \ ln -sf $(CURDIR)/install/qt/$${LIB}.stripped $(PWD)/debug/$$(basename $${LIB}); \ ln -sf $(CURDIR)/install/qt/$${LIB}.debug $(PWD)/debug/; \ diff --git a/repos/libports/lib/mk/qt5_declarative.mk b/repos/libports/lib/mk/qt5_declarative.mk index 993b49e223..788755ad2f 100644 --- a/repos/libports/lib/mk/qt5_declarative.mk +++ b/repos/libports/lib/mk/qt5_declarative.mk @@ -65,7 +65,7 @@ built.tag: qmake_prepared.tag cd $(CURDIR)/install/qt/$$(dirname $${LIB}) && \ $(OBJCOPY) --only-keep-debug $$(basename $${LIB}) $$(basename $${LIB}).debug && \ $(STRIP) $$(basename $${LIB}) -o $$(basename $${LIB}).stripped && \ - $(OBJCOPY) --add-gnu-debuglink=$$(basename $${LIB}).debug $$(basename $${LIB}); \ + $(OBJCOPY) --add-gnu-debuglink=$$(basename $${LIB}).debug $$(basename $${LIB}).stripped; \ ln -sf $(CURDIR)/install/qt/$${LIB}.stripped $(PWD)/bin/$$(basename $${LIB}); \ ln -sf $(CURDIR)/install/qt/$${LIB}.stripped $(PWD)/debug/$$(basename $${LIB}); \ ln -sf $(CURDIR)/install/qt/$${LIB}.debug $(PWD)/debug/; \ diff --git a/repos/libports/lib/mk/qt5_graphicaleffects.mk b/repos/libports/lib/mk/qt5_graphicaleffects.mk index 992908bf8b..a5e2a18f4b 100644 --- a/repos/libports/lib/mk/qt5_graphicaleffects.mk +++ b/repos/libports/lib/mk/qt5_graphicaleffects.mk @@ -41,7 +41,7 @@ built.tag: qmake_prepared.tag cd $(CURDIR)/install/qt/$$(dirname $${LIB}) && \ $(OBJCOPY) --only-keep-debug $$(basename $${LIB}) $$(basename $${LIB}).debug && \ $(STRIP) $$(basename $${LIB}) -o $$(basename $${LIB}).stripped && \ - $(OBJCOPY) --add-gnu-debuglink=$$(basename $${LIB}).debug $$(basename $${LIB}); \ + $(OBJCOPY) --add-gnu-debuglink=$$(basename $${LIB}).debug $$(basename $${LIB}).stripped; \ ln -sf $(CURDIR)/install/qt/$${LIB}.stripped $(PWD)/bin/$$(basename $${LIB}); \ ln -sf $(CURDIR)/install/qt/$${LIB}.stripped $(PWD)/debug/$$(basename $${LIB}); \ ln -sf $(CURDIR)/install/qt/$${LIB}.debug $(PWD)/debug/; \ diff --git a/repos/libports/lib/mk/qt5_quickcontrols.mk b/repos/libports/lib/mk/qt5_quickcontrols.mk index 27eecf6005..ce9fafb7f9 100644 --- a/repos/libports/lib/mk/qt5_quickcontrols.mk +++ b/repos/libports/lib/mk/qt5_quickcontrols.mk @@ -40,7 +40,7 @@ built.tag: qmake_prepared.tag cd $(CURDIR)/install/qt/$$(dirname $${LIB}) && \ $(OBJCOPY) --only-keep-debug $$(basename $${LIB}) $$(basename $${LIB}).debug && \ $(STRIP) $$(basename $${LIB}) -o $$(basename $${LIB}).stripped && \ - $(OBJCOPY) --add-gnu-debuglink=$$(basename $${LIB}).debug $$(basename $${LIB}); \ + $(OBJCOPY) --add-gnu-debuglink=$$(basename $${LIB}).debug $$(basename $${LIB}).stripped; \ ln -sf $(CURDIR)/install/qt/$${LIB}.stripped $(PWD)/bin/$$(basename $${LIB}); \ ln -sf $(CURDIR)/install/qt/$${LIB}.stripped $(PWD)/debug/$$(basename $${LIB}); \ ln -sf $(CURDIR)/install/qt/$${LIB}.debug $(PWD)/debug/; \ diff --git a/repos/libports/lib/mk/qt5_quickcontrols2.mk b/repos/libports/lib/mk/qt5_quickcontrols2.mk index f0a8d1ce82..bc881894d9 100644 --- a/repos/libports/lib/mk/qt5_quickcontrols2.mk +++ b/repos/libports/lib/mk/qt5_quickcontrols2.mk @@ -49,7 +49,7 @@ built.tag: qmake_prepared.tag cd $(CURDIR)/install/qt/$$(dirname $${LIB}) && \ $(OBJCOPY) --only-keep-debug $$(basename $${LIB}) $$(basename $${LIB}).debug && \ $(STRIP) $$(basename $${LIB}) -o $$(basename $${LIB}).stripped && \ - $(OBJCOPY) --add-gnu-debuglink=$$(basename $${LIB}).debug $$(basename $${LIB}); \ + $(OBJCOPY) --add-gnu-debuglink=$$(basename $${LIB}).debug $$(basename $${LIB}).stripped; \ ln -sf $(CURDIR)/install/qt/$${LIB}.stripped $(PWD)/bin/$$(basename $${LIB}); \ ln -sf $(CURDIR)/install/qt/$${LIB}.stripped $(PWD)/debug/$$(basename $${LIB}); \ ln -sf $(CURDIR)/install/qt/$${LIB}.debug $(PWD)/debug/; \ diff --git a/repos/libports/lib/mk/qt5_svg.mk b/repos/libports/lib/mk/qt5_svg.mk index 9608aa9c72..3c60574b9a 100644 --- a/repos/libports/lib/mk/qt5_svg.mk +++ b/repos/libports/lib/mk/qt5_svg.mk @@ -40,7 +40,7 @@ built.tag: qmake_prepared.tag cd $(CURDIR)/install/qt/$$(dirname $${LIB}) && \ $(OBJCOPY) --only-keep-debug $$(basename $${LIB}) $$(basename $${LIB}).debug && \ $(STRIP) $$(basename $${LIB}) -o $$(basename $${LIB}).stripped && \ - $(OBJCOPY) --add-gnu-debuglink=$$(basename $${LIB}).debug $$(basename $${LIB}); \ + $(OBJCOPY) --add-gnu-debuglink=$$(basename $${LIB}).debug $$(basename $${LIB}).stripped; \ ln -sf $(CURDIR)/install/qt/$${LIB}.stripped $(PWD)/bin/$$(basename $${LIB}); \ ln -sf $(CURDIR)/install/qt/$${LIB}.stripped $(PWD)/debug/$$(basename $${LIB}); \ ln -sf $(CURDIR)/install/qt/$${LIB}.debug $(PWD)/debug/; \ diff --git a/repos/libports/lib/mk/qt5_virtualkeyboard.mk b/repos/libports/lib/mk/qt5_virtualkeyboard.mk index 16087c0fee..e6b36e38d5 100644 --- a/repos/libports/lib/mk/qt5_virtualkeyboard.mk +++ b/repos/libports/lib/mk/qt5_virtualkeyboard.mk @@ -45,7 +45,7 @@ built.tag: qmake_prepared.tag cd $(CURDIR)/install/qt/$$(dirname $${LIB}) && \ $(OBJCOPY) --only-keep-debug $$(basename $${LIB}) $$(basename $${LIB}).debug && \ $(STRIP) $$(basename $${LIB}) -o $$(basename $${LIB}).stripped && \ - $(OBJCOPY) --add-gnu-debuglink=$$(basename $${LIB}).debug $$(basename $${LIB}); \ + $(OBJCOPY) --add-gnu-debuglink=$$(basename $${LIB}).debug $$(basename $${LIB}).stripped; \ ln -sf $(CURDIR)/install/qt/$${LIB}.stripped $(PWD)/bin/$$(basename $${LIB}); \ ln -sf $(CURDIR)/install/qt/$${LIB}.stripped $(PWD)/debug/$$(basename $${LIB}); \ ln -sf $(CURDIR)/install/qt/$${LIB}.debug $(PWD)/debug/; \