From aa8a7f51305f3b3027de894050aba127315d5b2a Mon Sep 17 00:00:00 2001
From: pierre <pierre@freepascal.org>
Date: Wed, 8 May 2019 09:38:43 +0000
Subject: [PATCH]  Do not use BSD system tar option -I if TARPROG is gtar for
 OpenBSD

git-svn-id: trunk@42022 -
---
 tests/Makefile     | 5 +++++
 tests/Makefile.fpc | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/tests/Makefile b/tests/Makefile
index 6ef27cce8a..c18f3aa848 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -2559,6 +2559,11 @@ ifneq ($(SVNVERSION),)
 	$(ECHOREDIR) svnpackagesrevision=$(SVN_PACKAGES_REV_STR) >> $(TEST_OUTPUTDIR)/dbdigest.cfg
 endif
 ifeq ($(OS_SOURCE),openbsd)
+ifeq ($(TARPROG),$(subst gtar,,$(TARPROG)))
+  BSD_SYSTEM_TAR=1
+endif
+endif
+ifdef BSD_SYSTEM_TAR
 TARFROM=-I tar.lst
 else
 TARFROM=--files-from=tar.lst
diff --git a/tests/Makefile.fpc b/tests/Makefile.fpc
index 3f38eb32a5..eb88d1eeab 100644
--- a/tests/Makefile.fpc
+++ b/tests/Makefile.fpc
@@ -647,6 +647,12 @@ endif
 # OpenBSD system tar executable doesn't know
 # about --files-from option, but supports -I
 ifeq ($(OS_SOURCE),openbsd)
+ifeq ($(TARPROG),$(subst gtar,,$(TARPROG)))
+  BSD_SYSTEM_TAR=1
+endif
+endif
+
+ifdef BSD_SYSTEM_TAR
 TARFROM=-I tar.lst
 else
 TARFROM=--files-from=tar.lst