Skip to content

Commit

Permalink
package/libmemcached: bump to version 1.1.4
Browse files Browse the repository at this point in the history
- Switch to an active fork
- Switch to cmake-package
- Drop all patches (not needed anymore)
- Use LICENSE file instead of COPYING as COPYING is now a symlink to
  LICENSE
- Handle libevent and openssl dependencies

https://awesomized.github.io/libmemcached/ChangeLog-1.1.html#v-1-1-4

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
  • Loading branch information
ffontaine authored and tpetazzoni committed Jul 29, 2023
1 parent 105e3b3 commit 7205df8
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 186 deletions.
5 changes: 0 additions & 5 deletions .checkpackageignore
Original file line number Diff line number Diff line change
Expand Up @@ -744,11 +744,6 @@ package/libloki/0002-use-ln-snf.patch Upstream
package/libmad/0001-mips-h-constraint-removal.patch Sob Upstream
package/libmad/0002-configure-ac-automake-foreign.patch Upstream
package/libmanette/0001-Meson-Un-hardcode-building-a-shared-library.patch Upstream
package/libmemcached/0001-disable-tests.patch Upstream
package/libmemcached/0002-disable-sanitizer.patch Upstream
package/libmemcached/0003-move-ac_config_aux_dir.patch Upstream
package/libmemcached/0004-disable-doc-and-man.patch Upstream
package/libmemcached/0005-fix-pointer-comparaison.patch Upstream
package/libmng/0001-jpeg-9a.patch Upstream
package/libmodsecurity/0001-configure.ac-drop-usage-of-git-at-configure-time.patch Upstream
package/libmodsecurity/0002-modsecurity.pc.in-add-lstdc.patch Upstream
Expand Down
42 changes: 0 additions & 42 deletions package/libmemcached/0001-disable-tests.patch

This file was deleted.

25 changes: 0 additions & 25 deletions package/libmemcached/0002-disable-sanitizer.patch

This file was deleted.

25 changes: 0 additions & 25 deletions package/libmemcached/0003-move-ac_config_aux_dir.patch

This file was deleted.

37 changes: 0 additions & 37 deletions package/libmemcached/0004-disable-doc-and-man.patch

This file was deleted.

30 changes: 0 additions & 30 deletions package/libmemcached/0005-fix-pointer-comparaison.patch

This file was deleted.

2 changes: 1 addition & 1 deletion package/libmemcached/Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ config BR2_PACKAGE_LIBMEMCACHED
It has been designed to be light on memory usage, thread safe,
and provide full access to server side methods.

http://libmemcached.org/libMemcached.html
https://awesomized.github.io/libmemcached

comment "libmemcached needs a toolchain w/ C++, threads"
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
6 changes: 3 additions & 3 deletions package/libmemcached/libmemcached.hash
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# From https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.tar.gz/+md5
md5 b3958716b4e53ddc5992e6c49d97e819 libmemcached-1.0.18.tar.gz
# Locally computed
sha256 c477e1f6510e1dc698e84f3717ce690a8f65b94c616ecaa62306cce0f5e3116a libmemcached-1.1.4.tar.gz

# Hash for license file:
sha256 4e9032d0f539276db05519ee3d09ca6167d2134ec91c556e8c80ef3efe633fd2 COPYING
sha256 65013ec8b416f28ae838ed3f23ea3ae47e5dbc70fe8492f39338e389a7970fd9 LICENSE
38 changes: 20 additions & 18 deletions package/libmemcached/libmemcached.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,28 @@
#
################################################################################

LIBMEMCACHED_VERSION_MAJOR = 1.0
LIBMEMCACHED_VERSION = $(LIBMEMCACHED_VERSION_MAJOR).18
LIBMEMCACHED_SITE = http://launchpad.net/libmemcached/$(LIBMEMCACHED_VERSION_MAJOR)/$(LIBMEMCACHED_VERSION)/+download
LIBMEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' \
ax_cv_check_cflags__Werror__fmudflapth=no \
ax_cv_check_cxxflags__Werror__fmudflapth=no
LIBMEMCACHED_CONF_OPTS = --disable-dtrace
LIBMEMCACHED_VERSION = 1.1.4
LIBMEMCACHED_SITE = \
$(call github,awesomized,libmemcached,$(LIBMEMCACHED_VERSION))
LIBMEMCACHED_CONF_OPTS = -DENABLE_DTRACE=OFF
LIBMEMCACHED_INSTALL_STAGING = YES
LIBMEMCACHED_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBEVENT),libevent)
# For 0001-disable-tests.patch and 0002-disable-sanitizer.patch
LIBMEMCACHED_AUTORECONF = YES
LIBMEMCACHED_DEPENDENCIES = host-bison host-flex
LIBMEMCACHED_LICENSE = BSD-3-Clause
LIBMEMCACHED_LICENSE_FILES = COPYING
LIBMEMCACHED_LICENSE_FILES = LICENSE
LIBMEMCACHED_CPE_ID_VENDOR = awesome

ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),)
LIBMEMCACHED_CONF_ENV += \
ax_cv_check_cflags__Werror__fPIE=no \
ax_cv_check_cflags__Werror__pie=no \
ax_cv_check_cxxflags__Werror__fPIE=no \
ax_cv_check_cxxflags__Werror__pie=no
ifeq ($(BR2_PACKAGE_LIBEVENT),y)
LIBMEMCACHED_DEPENDENCIES += libevent
LIBMEMCACHED_CONF_OPTS += -DENABLE_MEMASLAP=ON
else
LIBMEMCACHED_CONF_OPTS += -DENABLE_MEMASLAP=OFF
endif

$(eval $(autotools-package))
ifeq ($(BR2_PACKAGE_OPENSSL),y)
LIBMEMCACHED_DEPENDENCIES += openssl
LIBMEMCACHED_CONF_OPTS += -DENABLE_OPENSSL_CRYPTO=ON
else
LIBMEMCACHED_CONF_OPTS += -DENABLE_OPENSSL_CRYPTO=OFF
endif

$(eval $(cmake-package))

0 comments on commit 7205df8

Please sign in to comment.