From 458cb25d6cd4f97c4c5fe114dccca8e8736ac447 Mon Sep 17 00:00:00 2001 From: Sebastian Sumpf Date: Tue, 25 Jun 2024 10:24:45 +0200 Subject: [PATCH] qt5: use TAR_OPT for archives This commit produces consistent tar archives. issue #5255 --- repos/libports/lib/mk/qt5_base.mk | 6 +++--- 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 | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/repos/libports/lib/mk/qt5_base.mk b/repos/libports/lib/mk/qt5_base.mk index 587f8918af..8ae96b62e2 100644 --- a/repos/libports/lib/mk/qt5_base.mk +++ b/repos/libports/lib/mk/qt5_base.mk @@ -78,9 +78,9 @@ build: qmake_prepared.tag qmake_root/lib/ld.lib.so @# create tar archives @# - $(VERBOSE)tar chf $(PWD)/bin/qt5_libqgenode.tar --transform='s/\.stripped//' -C install qt/plugins/platforms/libqgenode.lib.so.stripped - $(VERBOSE)tar chf $(PWD)/bin/qt5_libqjpeg.tar --transform='s/\.stripped//' -C install qt/plugins/imageformats/libqjpeg.lib.so.stripped - $(VERBOSE)tar chf $(PWD)/bin/qt5_libqsqlite.tar --transform='s/\.stripped//' -C install qt/plugins/sqldrivers/libqsqlite.lib.so.stripped + $(VERBOSE)tar chf $(PWD)/bin/qt5_libqgenode.tar $(TAR_OPT) --transform='s/\.stripped//' -C install qt/plugins/platforms/libqgenode.lib.so.stripped + $(VERBOSE)tar chf $(PWD)/bin/qt5_libqjpeg.tar $(TAR_OPT) --transform='s/\.stripped//' -C install qt/plugins/imageformats/libqjpeg.lib.so.stripped + $(VERBOSE)tar chf $(PWD)/bin/qt5_libqsqlite.tar $(TAR_OPT) --transform='s/\.stripped//' -C install qt/plugins/sqldrivers/libqsqlite.lib.so.stripped .PHONY: build diff --git a/repos/libports/lib/mk/qt5_declarative.mk b/repos/libports/lib/mk/qt5_declarative.mk index d05d19a9d2..314bd5eba5 100644 --- a/repos/libports/lib/mk/qt5_declarative.mk +++ b/repos/libports/lib/mk/qt5_declarative.mk @@ -78,7 +78,7 @@ build: qmake_prepared.tag @# create tar archives @# - $(VERBOSE)tar chf $(PWD)/bin/qt5_declarative_qml.tar --exclude='*.lib.so' --transform='s/\.stripped//' -C install qt/qml + $(VERBOSE)tar chf $(PWD)/bin/qt5_declarative_qml.tar $(TAR_OPT) --exclude='*.lib.so' --transform='s/\.stripped//' -C install qt/qml .PHONY: build diff --git a/repos/libports/lib/mk/qt5_graphicaleffects.mk b/repos/libports/lib/mk/qt5_graphicaleffects.mk index 5bb5db1bb1..b16be9bc50 100644 --- a/repos/libports/lib/mk/qt5_graphicaleffects.mk +++ b/repos/libports/lib/mk/qt5_graphicaleffects.mk @@ -54,7 +54,7 @@ build: qmake_prepared.tag @# create tar archives @# - $(VERBOSE)tar chf $(PWD)/bin/qt5_graphicaleffects_qml.tar --exclude='*.lib.so' --transform='s/\.stripped//' -C install qt/qml + $(VERBOSE)tar chf $(PWD)/bin/qt5_graphicaleffects_qml.tar $(TAR_OPT) --exclude='*.lib.so' --transform='s/\.stripped//' -C install qt/qml .PHONY: build diff --git a/repos/libports/lib/mk/qt5_quickcontrols.mk b/repos/libports/lib/mk/qt5_quickcontrols.mk index ffdccb9fe2..9590fe8543 100644 --- a/repos/libports/lib/mk/qt5_quickcontrols.mk +++ b/repos/libports/lib/mk/qt5_quickcontrols.mk @@ -53,7 +53,7 @@ build: qmake_prepared.tag @# create tar archives @# - $(VERBOSE)tar chf $(PWD)/bin/qt5_quickcontrols_qml.tar --exclude='*.lib.so' --transform='s/\.stripped//' -C install qt/qml + $(VERBOSE)tar chf $(PWD)/bin/qt5_quickcontrols_qml.tar $(TAR_OPT) --exclude='*.lib.so' --transform='s/\.stripped//' -C install qt/qml .PHONY: build diff --git a/repos/libports/lib/mk/qt5_quickcontrols2.mk b/repos/libports/lib/mk/qt5_quickcontrols2.mk index 5197e9890a..4ee4666ee7 100644 --- a/repos/libports/lib/mk/qt5_quickcontrols2.mk +++ b/repos/libports/lib/mk/qt5_quickcontrols2.mk @@ -62,7 +62,7 @@ build: qmake_prepared.tag @# create tar archives @# - $(VERBOSE)tar chf $(PWD)/bin/qt5_quickcontrols2_qml.tar --exclude='*.lib.so' --transform='s/\.stripped//' -C install qt/qml + $(VERBOSE)tar chf $(PWD)/bin/qt5_quickcontrols2_qml.tar $(TAR_OPT) --exclude='*.lib.so' --transform='s/\.stripped//' -C install qt/qml .PHONY: build diff --git a/repos/libports/lib/mk/qt5_svg.mk b/repos/libports/lib/mk/qt5_svg.mk index c4b77f4e8f..f2e050b854 100644 --- a/repos/libports/lib/mk/qt5_svg.mk +++ b/repos/libports/lib/mk/qt5_svg.mk @@ -53,7 +53,7 @@ build: qmake_prepared.tag @# create tar archives @# - $(VERBOSE)tar chf $(PWD)/bin/qt5_libqsvg.tar --transform='s/\.stripped//' -C install qt/plugins/imageformats/libqsvg.lib.so.stripped + $(VERBOSE)tar chf $(PWD)/bin/qt5_libqsvg.tar $(TAR_OPT) --transform='s/\.stripped//' -C install qt/plugins/imageformats/libqsvg.lib.so.stripped .PHONY: build diff --git a/repos/libports/lib/mk/qt5_virtualkeyboard.mk b/repos/libports/lib/mk/qt5_virtualkeyboard.mk index e4514a8439..73f3651d5a 100644 --- a/repos/libports/lib/mk/qt5_virtualkeyboard.mk +++ b/repos/libports/lib/mk/qt5_virtualkeyboard.mk @@ -59,8 +59,8 @@ build: qmake_prepared.tag @# create tar archives @# - $(VERBOSE)tar chf $(PWD)/bin/qt5_libqtvirtualkeyboardplugin.tar --transform='s/\.stripped//' -C install qt/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.lib.so.stripped - $(VERBOSE)tar chf $(PWD)/bin/qt5_virtualkeyboard_qml.tar --exclude='*.lib.so' --transform='s/\.stripped//' -C install qt/qml + $(VERBOSE)tar chf $(PWD)/bin/qt5_libqtvirtualkeyboardplugin.tar $(TAR_OPT) --transform='s/\.stripped//' -C install qt/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.lib.so.stripped + $(VERBOSE)tar chf $(PWD)/bin/qt5_virtualkeyboard_qml.tar $(TAR_OPT) --exclude='*.lib.so' --transform='s/\.stripped//' -C install qt/qml .PHONY: build