jsoncpp: add back exceptions
authorRosen Penev <rosenp@gmail.com>
Tue, 15 Jun 2021 00:08:09 +0000 (17:08 -0700)
committerRosen Penev <rosenp@gmail.com>
Wed, 16 Jun 2021 03:04:50 +0000 (20:04 -0700)
domoticz wants them. No idea how to avoid it. Easier to just add back
here.

Removed several outdated options from CMake times.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
libs/jsoncpp/Makefile

index 2fa148f46a81274e53e8c3cfdff6590c4f7213f0..75f4a85681a561c377da47de7280f0185948fc9e 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=jsoncpp
 PKG_VERSION:=1.9.4
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/open-source-parsers/jsoncpp/tar.gz/$(PKG_VERSION)?
@@ -19,9 +19,6 @@ PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec@nic.cz>
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_BUILD_PARALLEL:=1
-CMAKE_INSTALL:=1
-
 PKG_BUILD_DEPENDS:=meson/host
 
 include $(INCLUDE_DIR)/package.mk
@@ -49,11 +46,8 @@ endef
 
 MESON_ARGS += \
        -Db_lto=true \
-       -Dcpp_eh=none \
-       -Dcpp_rtti=false \
        -Dtests=false
 
-TARGET_CXXFLAGS += -DJSON_USE_EXCEPTION=0
 TARGET_LDFLAGS += -Wl,--gc-sections
 
 define Build/InstallDev