paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 12:29:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge of revisions 42022 from trunk to fixes_3_2

Browse Source 
------------------------------------------------------------------------
r42022 | pierre | 2019-05-08 11:38:43 +0200 (Wed, 08 May 2019) | 1 line

 Do not use BSD system tar option -I if TARPROG is gtar for OpenBSD
------------------------------------------------------------------------
--- Merging r42022 into '.':
U    tests/Makefile
U    tests/Makefile.fpc
--- Recording mergeinfo for merge of r42022 into '.':
 U   .

git-svn-id: branches/fixes_3_2@42023 -
This commit is contained in:
pierre 2019-05-09 15:50:33 +00:00
parent e1afc90ef4
commit 0668d7385b
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/Makefile
View File

@ -2525,6 +2525,11 @@ ifneq ($(SVNVERSION),)
$(ECHOREDIR) svnpackagesrevision=$(SVN_PACKAGES_REV_STR) >> $(TEST_OUTPUTDIR)/dbdigest.cfg $(ECHOREDIR) svnpackagesrevision=$(SVN_PACKAGES_REV_STR) >> $(TEST_OUTPUTDIR)/dbdigest.cfg
endif endif
ifeq ($(OS_SOURCE),openbsd) ifeq ($(OS_SOURCE),openbsd)
ifeq ($(TARPROG),$(subst gtar,,$(TARPROG)))
BSD_SYSTEM_TAR=1
endif
endif
ifdef BSD_SYSTEM_TAR
TARFROM=-I tar.lst TARFROM=-I tar.lst
else else
TARFROM=--files-from=tar.lst TARFROM=--files-from=tar.lst

6
tests/Makefile.fpc
View File

@ -644,6 +644,12 @@ endif
# OpenBSD system tar executable doesn't know # OpenBSD system tar executable doesn't know
# about --files-from option, but supports -I # about --files-from option, but supports -I
ifeq ($(OS_SOURCE),openbsd) ifeq ($(OS_SOURCE),openbsd)
ifeq ($(TARPROG),$(subst gtar,,$(TARPROG)))
BSD_SYSTEM_TAR=1
endif
endif
ifdef BSD_SYSTEM_TAR
TARFROM=-I tar.lst TARFROM=-I tar.lst
else else
TARFROM=--files-from=tar.lst TARFROM=--files-from=tar.lst