NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

monkey: switch to cmake package

Browse Source 
Since version 1.6.x the configure script is a wrapper around cmake. Use
cmake directly since we want to make sure that cmake is available.

monkey no longer provides the libmonkey.so shared library. Remove the
BR2_PACKAGE_MONKEY_SHARED option.

Fixes:
http://autobuild.buildroot.net/results/b07/b077720c16857b752f4f38b73619a6a62862f35f/
http://autobuild.buildroot.net/results/799/799bcbd332f254fbf3d3547e5e52ac9463d58bcc/
http://autobuild.buildroot.net/results/3b0/3b095ca77a900af724fbc79d9cc20cbb9931fe15/

Cc: Morgan Delestre <m.delestre@sinters.fr>
Cc: David Pierret <david.pierret@gmail.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Baruch Siach 2018-09-23 07:22:34 +03:00 committed by Thomas Petazzoni
parent f8f8ff3347
commit 5fea6e2a2f
2 changed files with 8 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/monkey/Config.in
View File

@ -11,12 +11,6 @@ config BR2_PACKAGE_MONKEY
if BR2_PACKAGE_MONKEY
config BR2_PACKAGE_MONKEY_SHARED
bool "install shared library"
help
Build Monkey as a shared library in addition to stand-alone
server
config BR2_PACKAGE_MONKEY_SSL
bool "enable SSL/TLS"
select BR2_PACKAGE_MBEDTLS

49
package/monkey/monkey.mk
View File

@ -15,58 +15,25 @@ MONKEY_LICENSE_FILES = LICENSE
# infrastructure.
MONKEY_CONF_OPTS = \
--prefix=/usr \
--sysconfdir=/etc/monkey \
--webroot=/var/www \
--mandir=/usr/share/man \
--logdir=/var/log \
--pidfile=/var/run \
--malloc-libc
-DINSTALL_SYSCONFDIR=/etc/monkey \
-DINSTALL_WEBROOTDIR=/var/www \
-DWITH_SYSTEM_MALLOC=1
# --uclib-mode is not a typo
ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
MONKEY_CONF_OPTS += --uclib-mode --no-backtrace
MONKEY_CONF_OPTS += -DWITH_UCLIB=1 -DWITH_BACKTRACE=0
endif
ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y)
MONKEY_CONF_OPTS += --musl-mode --no-backtrace
endif
ifeq ($(BR2_PACKAGE_MONKEY_SHARED),y)
MONKEY_CONF_OPTS += --enable-shared
MONKEY_INSTALL_STAGING = YES
else
# Even without --enable-shared, the monkey build system leaves a
# broken libmonkey.so symbolic link.
define MONKEY_REMOVE_DANGLING_SYMLINK
$(RM) -f $(TARGET_DIR)/usr/lib/libmonkey.so
endef
MONKEY_POST_INSTALL_TARGET_HOOKS += MONKEY_REMOVE_DANGLING_SYMLINK
MONKEY_CONF_OPTS += -DWITH_MUSL=1 -DWITH_BACKTRACE=0
endif
ifeq ($(BR2_ENABLE_DEBUG),y)
MONKEY_CONF_OPTS += --debug
MONKEY_CONF_OPTS += -DWITH_DEBUG=1
endif
ifeq ($(BR2_PACKAGE_MONKEY_SSL),y)
MONKEY_CONF_OPTS += --enable-plugins=tls --mbedtls-shared
MONKEY_CONF_OPTS += -DWITH_PLUGINS=tls -DWITH_MBEDTLS_SHARED=1
MONKEY_DEPENDENCIES += mbedtls
endif
define MONKEY_CONFIGURE_CMDS
(cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure $(MONKEY_CONF_OPTS))
endef
define MONKEY_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
endef
define MONKEY_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install
endef
define MONKEY_INSTALL_TARGET_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
endef
$(eval $(generic-package))
$(eval $(cmake-package))