Browse Source

* Fix tar option for OpenBSD

git-svn-id: trunk@19505 -
pierre 14 years ago
parent
commit
95ea87d797
2 changed files with 14 additions and 2 deletions
  1. 6 1
      tests/Makefile
  2. 8 1
      tests/Makefile.fpc

+ 6 - 1
tests/Makefile

@@ -1599,6 +1599,11 @@ ifneq ($(SVNVERSION),)
 	$(ECHOREDIR) svnrtlrevision=$(SVN_RTL_REV_STR) >> $(TEST_OUTPUTDIR)/dbdigest.cfg
 	$(ECHOREDIR) svnpackagesrevision=$(SVN_PACKAGES_REV_STR) >> $(TEST_OUTPUTDIR)/dbdigest.cfg
 endif
+ifeq ($(OS_SOURCE),openbsd)
+TARFROM=-I tar.lst
+else
+TARFROM=--files-from=tar.lst
+endif
 ifndef inWinDOS
 $(TEST_OUTPUTDIR)/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
 	dos2unix $(TEST_OUTPUTDIR)/tar.lst
 endif
-	cd $(TEST_OUTPUTDIR) && $(TARPROG) czf $(DB_TARGZ) --files-from=tar.lst
+	cd $(TEST_OUTPUTDIR) && $(TARPROG) czf $(DB_TARGZ) $(TARFROM)
 else
 $(TEST_OUTPUTDIR)/$(DB_TARGZ): $(TEST_OUTPUTDIR)/dbdigest.cfg
 ifdef inDOS

+ 8 - 1
tests/Makefile.fpc

@@ -486,6 +486,13 @@ ifneq ($(SVNVERSION),)
         $(ECHOREDIR) svnpackagesrevision=$(SVN_PACKAGES_REV_STR) >> $(TEST_OUTPUTDIR)/dbdigest.cfg
 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
 $(TEST_OUTPUTDIR)/tar.lst:
@@ -497,7 +504,7 @@ $(TEST_OUTPUTDIR)/$(DB_TARGZ): $(TEST_OUTPUTDIR)/tar.lst $(TEST_OUTPUTDIR)/dbdig
 ifdef inCygWin
         dos2unix $(TEST_OUTPUTDIR)/tar.lst
 endif
-        cd $(TEST_OUTPUTDIR) && $(TARPROG) czf $(DB_TARGZ) --files-from=tar.lst
+        cd $(TEST_OUTPUTDIR) && $(TARPROG) czf $(DB_TARGZ) $(TARFROM)
 
 else
 $(TEST_OUTPUTDIR)/$(DB_TARGZ): $(TEST_OUTPUTDIR)/dbdigest.cfg