On 11/19/2010 09:17 PM, George McCollister wrote: > I added a new packet memcached.
Can you outline the changes you made? Does it work now for ARM? cheers, Marc > > Signed-off-by: George McCollister <[email protected]> > [mkl: beautified indention] > Signed-off-by: Marc Kleine-Budde <[email protected]> > --- > .../0001-Switch-AC_RUN-to-AC_LINK.patch | 42 ++++++++++++++ > ...Change-configure.ac-to-use-AC_C_BIGENDIAN.patch | 57 > ++++++++++++++++++++ > patches/memcached-1.4.5/autogen.sh | 1 + > patches/memcached-1.4.5/series | 4 ++ > rules/memcached.in | 11 ++++ > rules/memcached.make | 54 ++++++++++++++++++ > 6 files changed, 169 insertions(+), 0 deletions(-) > create mode 100644 > patches/memcached-1.4.5/0001-Switch-AC_RUN-to-AC_LINK.patch > create mode 100644 > patches/memcached-1.4.5/0002-Change-configure.ac-to-use-AC_C_BIGENDIAN.patch > create mode 120000 patches/memcached-1.4.5/autogen.sh > create mode 100644 patches/memcached-1.4.5/series > create mode 100644 rules/memcached.in > create mode 100644 rules/memcached.make > > diff --git a/patches/memcached-1.4.5/0001-Switch-AC_RUN-to-AC_LINK.patch > b/patches/memcached-1.4.5/0001-Switch-AC_RUN-to-AC_LINK.patch > new file mode 100644 > index 0000000..c967235 > --- /dev/null > +++ b/patches/memcached-1.4.5/0001-Switch-AC_RUN-to-AC_LINK.patch > @@ -0,0 +1,42 @@ > +From: George McCollister <[email protected]> > +Date: Wed, 17 Nov 2010 10:57:25 -0600 > +Subject: [PATCH] Switch AC_RUN to AC_LINK > + > +AC_RUN checks fail when cross compiling, switched them to AC_LINK. > + > +Signed-off-by: George McCollister <[email protected]> > +Signed-off-by: Marc Kleine-Budde <[email protected]> > +--- > + configure.ac | 5 +++-- > + 1 files changed, 3 insertions(+), 2 deletions(-) > + > +diff --git a/configure.ac b/configure.ac > +index 9d2a485..d604de1 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -45,11 +45,12 @@ AC_DEFUN([DETECT_SUNCC], > + [ > + SUNCC="no" > + AC_MSG_CHECKING([for Sun cc in use]) > +- AC_RUN_IFELSE( > ++ AC_COMPILE_IFELSE( > + [AC_LANG_PROGRAM([], [dnl > + #ifdef __SUNPRO_C > + return 0; > + #else > ++#error not sun cc > + return 1; > + #endif > + ]) > +@@ -392,7 +393,7 @@ AC_DEFUN([AC_C_HTONLL], > + [ > + AC_MSG_CHECKING([for htonll]) > + have_htoll="no" > +- AC_RUN_IFELSE([ > ++ AC_LINK_IFELSE([ > + AC_LANG_PROGRAM([ > + #include <sys/types.h> > + #include <netinet/in.h> > +-- > +1.7.2.3 > + > diff --git > a/patches/memcached-1.4.5/0002-Change-configure.ac-to-use-AC_C_BIGENDIAN.patch > > b/patches/memcached-1.4.5/0002-Change-configure.ac-to-use-AC_C_BIGENDIAN.patch > new file mode 100644 > index 0000000..f84fb08 > --- /dev/null > +++ > b/patches/memcached-1.4.5/0002-Change-configure.ac-to-use-AC_C_BIGENDIAN.patch > @@ -0,0 +1,57 @@ > +From: George McCollister <[email protected]> > +Date: Thu, 18 Nov 2010 10:39:18 -0600 > +Subject: [PATCH] Change configure.ac to use AC_C_BIGENDIAN > + > +Use AC_C_BIGENDIAN instead of a custom check in configure.ac. > + > +Signed-off-by: George McCollister <[email protected]> > +Signed-off-by: Marc Kleine-Budde <[email protected]> > +--- > + configure.ac | 31 ++++++------------------------- > + 1 files changed, 6 insertions(+), 25 deletions(-) > + > +diff --git a/configure.ac b/configure.ac > +index d604de1..4e86589 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -363,31 +363,12 @@ fi > + > + AC_C_SOCKLEN_T > + > +-dnl Check if we're a little-endian or a big-endian system, needed by hash > code > +-AC_DEFUN([AC_C_ENDIAN], > +-[AC_CACHE_CHECK(for endianness, ac_cv_c_endian, > +-[ > +- AC_RUN_IFELSE( > +- [AC_LANG_PROGRAM([], [dnl > +- long val = 1; > +- char *c = (char *) &val; > +- exit(*c == 1); > +- ]) > +- ],[ > +- ac_cv_c_endian=big > +- ],[ > +- ac_cv_c_endian=little > +- ]) > +-]) > +-if test $ac_cv_c_endian = big; then > +- AC_DEFINE(ENDIAN_BIG, 1, [machine is bigendian]) > +-fi > +-if test $ac_cv_c_endian = little; then > +- AC_DEFINE(ENDIAN_LITTLE, 1, [machine is littleendian]) > +-fi > +-]) > +- > +-AC_C_ENDIAN > ++AC_C_BIGENDIAN( > ++ AC_DEFINE(ENDIAN_BIG, 1, [machine is bigendian]), > ++ AC_DEFINE(ENDIAN_LITTLE, 1, [machine is littleendian]), > ++ AC_MSG_ERROR(unknown endianess), > ++ AC_MSG_ERROR(universial endianess not supported) > ++) > + > + AC_DEFUN([AC_C_HTONLL], > + [ > +-- > +1.7.2.3 > + > diff --git a/patches/memcached-1.4.5/autogen.sh > b/patches/memcached-1.4.5/autogen.sh > new file mode 120000 > index 0000000..9f8a4cb > --- /dev/null > +++ b/patches/memcached-1.4.5/autogen.sh > @@ -0,0 +1 @@ > +../autogen.sh > \ No newline at end of file > diff --git a/patches/memcached-1.4.5/series b/patches/memcached-1.4.5/series > new file mode 100644 > index 0000000..5a0ae45 > --- /dev/null > +++ b/patches/memcached-1.4.5/series > @@ -0,0 +1,4 @@ > +# generated by git-ptx-patches > +0001-Switch-AC_RUN-to-AC_LINK.patch > +0002-Change-configure.ac-to-use-AC_C_BIGENDIAN.patch > +# 09541c0db6fa5da1e383ec8ae47e9fa4 - git-ptx-patches magic > diff --git a/rules/memcached.in b/rules/memcached.in > new file mode 100644 > index 0000000..fba71c6 > --- /dev/null > +++ b/rules/memcached.in > @@ -0,0 +1,11 @@ > +## SECTION=networking > + > +config MEMCACHED > + tristate > + select LIBEVENT > + prompt "memcached" > + help > + Memcached is an in-memory key-value store for small chunks of > + arbitrary data (strings, objects) from results of database calls, > + API calls, or page rendering. > + > diff --git a/rules/memcached.make b/rules/memcached.make > new file mode 100644 > index 0000000..ccc3cba > --- /dev/null > +++ b/rules/memcached.make > @@ -0,0 +1,54 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2010 by NovaTech-LLC > +# > +# See CREDITS for details about who has contributed to this project. > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +PACKAGES-$(PTXCONF_MEMCACHED) += memcached > + > +# > +# Paths and names > +# > +MEMCACHED_VERSION := 1.4.5 > +MEMCACHED := memcached-$(MEMCACHED_VERSION) > +MEMCACHED_SUFFIX := tar.gz > +MEMCACHED_URL := > http://memcached.googlecode.com/files/$(MEMCACHED).$(MEMCACHED_SUFFIX) > +MEMCACHED_SOURCE := $(SRCDIR)/$(MEMCACHED).$(MEMCACHED_SUFFIX) > +MEMCACHED_DIR := $(BUILDDIR)/$(MEMCACHED) > + > +# > ---------------------------------------------------------------------------- > +# Prepare > +# > ---------------------------------------------------------------------------- > + > +MEMCACHED_ENV := \ > + $(CROSS_ENV) \ > + ac_cv_c_alignment=need > + > +# > ---------------------------------------------------------------------------- > +# Target-Install > +# > ---------------------------------------------------------------------------- > + > +$(STATEDIR)/memcached.targetinstall: > + @$(call targetinfo) > + > + @$(call install_init, memcached) > + @$(call install_fixup, memcached, PRIORITY, optional) > + @$(call install_fixup, memcached, SECTION, base) > + @$(call install_fixup, memcached, AUTHOR,"NovaTech-LLC") > + @$(call install_fixup, memcached, DESCRIPTION, missing) > + > + @$(call install_copy, memcached, 0, 0, 0755, -, /usr/bin/memcached) > + @$(call install_copy, memcached, 0, 0, 0700, /var/run/memcached) > + > + @$(call install_finish, memcached) > + > + @$(call touch) > + > +# vim: syntax=make -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
signature.asc
Description: OpenPGP digital signature
-- ptxdist mailing list [email protected]
