Revert applying oetiker/rrdtool-1.x#1012

chrisburr · Aug 29, 2020 · c24eab0 · c24eab0
1 parent ce90776
commit c24eab0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 46 deletions.
diff --git a/recipes/rrdtool/1012.patch b/recipes/rrdtool/1012.patch
diff --git a/recipes/rrdtool/build.sh b/recipes/rrdtool/build.sh
@@ -15,11 +15,11 @@ IFS=$'\n\t'
 make "-j${CPU_COUNT}"
 
 XFAIL_TESTS=""
-# if [[ "$(uname)" == "Darwin" && "${PKG_VERSION}" == "1.7.2" ]]; then
-#     # Known failure, should be fixed in the next version
-#     # https://github.com/oetiker/rrdtool-1.x/issues/1012
-#     XFAIL_TESTS="${XFAIL_TESTS} rpn2"
-# fi
+if [[ "$(uname)" == "Darwin" && "${PKG_VERSION}" == "1.7.2" ]]; then
+    # Known failure, should be fixed in the next version
+    # https://github.com/oetiker/rrdtool-1.x/issues/1012
+    XFAIL_TESTS="${XFAIL_TESTS} rpn2"
+fi
 
 make check XFAIL_TESTS="${XFAIL_TESTS}" || (cat tests/test-suite.log && exit 1)
 

diff --git a/recipes/rrdtool/meta.yaml b/recipes/rrdtool/meta.yaml
@@ -8,8 +8,6 @@ package:
 source:
   url: https://github.com/oetiker/rrdtool-1.x/archive/v{{ version }}.tar.gz
   sha256: b26afc012dc0f2ade149bcb771e8b7d9b86922f5f9e4096c1c12e6d80061b61a
-  patches:
-    - 1012.patch
 
 build:
   number: 0