paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-03 03:09:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Fix tar option for OpenBSD

Browse Source 
git-svn-id: trunk@19505 -
This commit is contained in:
pierre 2011-10-17 09:24:19 +00:00
parent 5f77ff8a18
commit 95ea87d797
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/Makefile
View File

@ -1599,6 +1599,11 @@ ifneq ($(SVNVERSION),)
$(ECHOREDIR) svnrtlrevision=$(SVN_RTL_REV_STR) >> $(TEST_OUTPUTDIR)/dbdigest.cfg $(ECHOREDIR) svnrtlrevision=$(SVN_RTL_REV_STR) >> $(TEST_OUTPUTDIR)/dbdigest.cfg
$(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)
TARFROM=-I tar.lst
else
TARFROM=--files-from=tar.lst
endif
ifndef inWinDOS ifndef inWinDOS
$(TEST_OUTPUTDIR)/tar.lst: $(TEST_OUTPUTDIR)/tar.lst:
cd $(TEST_OUTPUTDIR) && find . -name '*.log' -o -name '*.elg' > tar.lst cd $(TEST_OUTPUTDIR) && find . -name '*.log' -o -name '*.elg' > tar.lst
@ -1608,7 +1613,7 @@ $(TEST_OUTPUTDIR)/$(DB_TARGZ): $(TEST_OUTPUTDIR)/tar.lst $(TEST_OUTPUTDIR)/dbdig
ifdef inCygWin ifdef inCygWin
dos2unix $(TEST_OUTPUTDIR)/tar.lst dos2unix $(TEST_OUTPUTDIR)/tar.lst
endif endif
cd $(TEST_OUTPUTDIR) && $(TARPROG) czf $(DB_TARGZ) --files-from=tar.lst cd $(TEST_OUTPUTDIR) && $(TARPROG) czf $(DB_TARGZ) $(TARFROM)
else else
$(TEST_OUTPUTDIR)/$(DB_TARGZ): $(TEST_OUTPUTDIR)/dbdigest.cfg $(TEST_OUTPUTDIR)/$(DB_TARGZ): $(TEST_OUTPUTDIR)/dbdigest.cfg
ifdef inDOS ifdef inDOS

9
tests/Makefile.fpc
View File

@ -486,6 +486,13 @@ ifneq ($(SVNVERSION),)
$(ECHOREDIR) svnpackagesrevision=$(SVN_PACKAGES_REV_STR) >> $(TEST_OUTPUTDIR)/dbdigest.cfg $(ECHOREDIR) svnpackagesrevision=$(SVN_PACKAGES_REV_STR) >> $(TEST_OUTPUTDIR)/dbdigest.cfg
endif endif
# OpenBSD system tar executable doesn't know
# about --files-from option, but supports -I
ifeq ($(OS_SOURCE),openbsd)
TARFROM=-I tar.lst
else
TARFROM=--files-from=tar.lst
endif
ifndef inWinDOS ifndef inWinDOS
$(TEST_OUTPUTDIR)/tar.lst: $(TEST_OUTPUTDIR)/tar.lst:
@ -497,7 +504,7 @@ $(TEST_OUTPUTDIR)/$(DB_TARGZ): $(TEST_OUTPUTDIR)/tar.lst $(TEST_OUTPUTDIR)/dbdig
ifdef inCygWin ifdef inCygWin
dos2unix $(TEST_OUTPUTDIR)/tar.lst dos2unix $(TEST_OUTPUTDIR)/tar.lst
endif endif
cd $(TEST_OUTPUTDIR) && $(TARPROG) czf $(DB_TARGZ) --files-from=tar.lst cd $(TEST_OUTPUTDIR) && $(TARPROG) czf $(DB_TARGZ) $(TARFROM)
else else
$(TEST_OUTPUTDIR)/$(DB_TARGZ): $(TEST_OUTPUTDIR)/dbdigest.cfg $(TEST_OUTPUTDIR)/$(DB_TARGZ): $(TEST_OUTPUTDIR)/dbdigest.cfg