openzwave/trunk/openzwave-system-libs.patch

   1 diff -rupN open-zwave.orig/cpp/build/Makefile open-zwave/cpp/build/Makefile
   2 --- open-zwave.orig/cpp/build/Makefile  2019-07-18 09:49:01.185154576 +0200
   3 +++ open-zwave/cpp/build/Makefile       2019-07-18 09:58:36.413855845 +0200
   4 @@ -23,7 +23,7 @@ DEBUG_LDFLAGS := -g
   5
   6  #default Libraries we should link with
   7  ifneq ($(UNAME),FreeBSD)
   8 -LIBS += -lresolv
   9 +LIBS += -lresolv -ltinyxml
  10  endif
  11
  12  top_srcdir := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../../)
  13 @@ -84,47 +84,19 @@ endif
  14  #where to put the temporary library
  15  LIBDIR ?= $(top_builddir)
  16
  17 -INCLUDES       := -I $(top_srcdir)/cpp/src -I $(top_srcdir)/cpp/tinyxml/
  18 +INCLUDES       := -I $(top_srcdir)/cpp/src
  19
  20
  21  ifeq ($(USE_HID),1)
  22 -INCLUDES += -I $(top_srcdir)/cpp/hidapi/hidapi/
  23 +INCLUDES += -I /usr/include/hidapi/
  24  CFLAGS += -DUSE_HID
  25 -
  26 -ifeq ($(UNAME),Darwin)
  27 -SOURCES_HIDAPI =$(top_srcdir)/cpp/hidapi/mac
  28 -else ifeq ($(UNAME),FreeBSD)
  29 -SOURCES_HIDAPI =$(top_srcdir)/cpp/hidapi/libusb
  30 -else ifeq ($(UNAME),NetBSD)
  31 -SOURCES_HIDAPI =$(top_srcdir)/cpp/hidapi/libusb
  32 -else ifeq ($(UNAME),SunOS)
  33 -SOURCES_HIDAPI =$(top_srcdir)/cpp/hidapi/libusb
  34 -else
  35 -SOURCES_HIDAPI =$(top_srcdir)/cpp/hidapi/linux
  36 -LIBS += -ludev
  37 -endif
  38 +LIBS += -ludev -lhidapi-libusb
  39  endif # USE_HID
  40
  41 -SOURCES                := $(top_srcdir)/cpp/src $(top_srcdir)/cpp/src/command_classes $(top_srcdir)/cpp/tinyxml \
  42 -       $(top_srcdir)/cpp/src/value_classes $(top_srcdir)/cpp/src/platform $(top_srcdir)/cpp/src/platform/unix $(SOURCES_HIDAPI) $(top_srcdir)/cpp/src/aes/
  43 -VPATH = $(top_srcdir)/cpp/src:$(top_srcdir)/cpp/src/command_classes:$(top_srcdir)/cpp/tinyxml:\
  44 -       $(top_srcdir)/cpp/src/value_classes:$(top_srcdir)/cpp/src/platform:$(top_srcdir)/cpp/src/platform/unix:$(SOURCES_HIDAPI):$(top_srcdir)/cpp/src/aes/
  45 -
  46 -tinyxml := $(notdir $(wildcard $(top_srcdir)/cpp/tinyxml/*.cpp))
  47 -
  48 -ifeq ($(USE_HID),1)
  49 -ifeq ($(UNAME),Darwin)
  50 -hidapi := $(notdir $(wildcard $(top_srcdir)/cpp/hidapi/mac/*.c))
  51 -else ifeq ($(UNAME),FreeBSD)
  52 -hidapi := $(notdir $(wildcard $(top_srcdir)/cpp/hidapi/libusb/*.c))
  53 -else ifeq ($(UNAME),NetBSD)
  54 -hidapi := $(notdir $(wildcard $(top_srcdir)/cpp/hidapi/libusb/*.c))
  55 -else ifeq ($(UNAME),SunOS)
  56 -hidapi := $(notdir $(wildcard $(top_srcdir)/cpp/hidapi/libusb/*.c))
  57 -else
  58 -hidapi := $(notdir $(wildcard $(top_srcdir)/cpp/hidapi/linux/*.c)) # we do not want the libusb version
  59 -endif
  60 -endif # USE_HID
  61 +SOURCES                := $(top_srcdir)/cpp/src $(top_srcdir)/cpp/src/command_classes \
  62 +       $(top_srcdir)/cpp/src/value_classes $(top_srcdir)/cpp/src/platform $(top_srcdir)/cpp/src/platform/unix $(top_srcdir)/cpp/src/aes/
  63 +VPATH = $(top_srcdir)/cpp/src:$(top_srcdir)/cpp/src/command_classes:\
  64 +       $(top_srcdir)/cpp/src/value_classes:$(top_srcdir)/cpp/src/platform:$(top_srcdir)/cpp/src/platform/unix:$(top_srcdir)/cpp/src/aes/
  65
  66  ifeq ($(BITBAKE_ENV),1)
  67  ar_option := "rc"
  68 @@ -147,8 +119,6 @@ printversion:
  69         @echo "Building OpenZWave Version $(GITVERSION)"
  70
  71
  72 --include $(patsubst %.cpp,$(DEPDIR)/%.d,$(tinyxml))
  73 --include $(patsubst %.c,$(DEPDIR)/%.d,$(hidapi))
  74  -include $(patsubst %.cpp,$(DEPDIR)/%.d,$(cclasses))
  75  -include $(patsubst %.cpp,$(DEPDIR)/%.d,$(vclasses))
  76  -include $(patsubst %.cpp,$(DEPDIR)/%.d,$(pform))
  77 @@ -167,9 +137,7 @@ $(top_srcdir)/cpp/src/vers.cpp:
  78
  79  #$(OBJDIR)/vers.o:     $(top_builddir)/vers.cpp
  80
  81 -$(LIBDIR)/libopenzwave.a:      $(patsubst %.cpp,$(OBJDIR)/%.o,$(tinyxml)) \
  82 -                       $(patsubst %.c,$(OBJDIR)/%.o,$(hidapi)) \
  83 -                       $(patsubst %.c,$(OBJDIR)/%.o,$(aes)) \
  84 +$(LIBDIR)/libopenzwave.a:      $(patsubst %.c,$(OBJDIR)/%.o,$(aes)) \
  85                         $(patsubst %.cpp,$(OBJDIR)/%.o,$(cclasses)) \
  86                         $(patsubst %.cpp,$(OBJDIR)/%.o,$(vclasses)) \
  87                         $(patsubst %.cpp,$(OBJDIR)/%.o,$(pform)) \
  88 @@ -179,9 +147,7 @@ $(LIBDIR)/libopenzwave.a:   $(patsubst %.c
  89         @$(AR) $(ar_option) $@ $+
  90         @$(RANLIB) $@
  91
  92 -$(LIBDIR)/$(SHARED_LIB_NAME):  $(patsubst %.cpp,$(OBJDIR)/%.o,$(tinyxml)) \
  93 -                       $(patsubst %.c,$(OBJDIR)/%.o,$(hidapi)) \
  94 -                       $(patsubst %.c,$(OBJDIR)/%.o,$(aes)) \
  95 +$(LIBDIR)/$(SHARED_LIB_NAME):  $(patsubst %.c,$(OBJDIR)/%.o,$(aes)) \
  96                         $(patsubst %.cpp,$(OBJDIR)/%.o,$(cclasses)) \
  97                         $(patsubst %.cpp,$(OBJDIR)/%.o,$(vclasses)) \
  98                         $(patsubst %.cpp,$(OBJDIR)/%.o,$(pform)) \