From e8fc56a3d22dfea764725574a7c57fa9a5f16519 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 15 Jul 2019 18:24:10 +0200 Subject: gnu: open-zwave: Use the bundled TinyXML. * gnu/packages/zwave.scm (open-zwave)[source](snippet): Remove code to use our own TinyXML. [inputs]: Remove TINYXML. --- gnu/packages/zwave.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gnu/packages/zwave.scm b/gnu/packages/zwave.scm index f07367d264..2019ec32df 100644 --- a/gnu/packages/zwave.scm +++ b/gnu/packages/zwave.scm @@ -51,11 +51,9 @@ (define-public open-zwave (("\\$\\(LDFLAGS\\)") "$(LDFLAGS) -Wl,-rpath=$(PREFIX)/lib")) - ;; Delete the bundled TinyXML. - (delete-file-recursively "cpp/tinyxml") - (substitute* "cpp/build/Makefile" - (("LIBS \\+= -ludev") - "LIBS += -ludev -ltinyxml ")) + ;; XXX: There's a bundled TinyXML under cpp/tinyxml. Keep + ;; it because using our own TinyXML leads to double-free + ;; down the road. ;; Delete the bundled HIDAPI. (delete-file-recursively "cpp/hidapi") @@ -80,8 +78,7 @@ (define-public open-zwave ("pkg-config" ,pkg-config) ("perl" ,perl) ;for tests ("perl-xml-simple" ,perl-xml-simple))) - (inputs `(("tinyxml" ,tinyxml) - ("hidapi" ,hidapi) + (inputs `(("hidapi" ,hidapi) ("eudev" ,eudev))) (home-page "http://www.openzwave.net/") (synopsis "Access Z-Wave devices from C++ programs") -- cgit v1.2.3