Browse Source

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.
gn-latest-20200428
Ludovic Courtès 2 years ago
parent
commit
e8fc56a3d2
No known key found for this signature in database GPG Key ID: 90B11993D9AEBB5
1 changed files with 4 additions and 7 deletions
  1. +4
    -7
      gnu/packages/zwave.scm

+ 4
- 7
gnu/packages/zwave.scm View File

@ -51,11 +51,9 @@
(("\\$\\(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 @@
("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")


Loading…
Cancel
Save