packages: memcached/repcached.patch - filter out unwanted chunks: filterd...
glen
glen at pld-linux.org
Thu May 6 13:30:45 CEST 2010
Author: glen Date: Thu May 6 11:30:45 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- filter out unwanted chunks:
filterdiff -p1 -x config.guess -x config.sub -x configure -x doc/Makefile -x Makefile.in -x memcached.spec
---- Files affected:
packages/memcached:
repcached.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/memcached/repcached.patch
diff -u packages/memcached/repcached.patch:1.1 packages/memcached/repcached.patch:1.2
--- packages/memcached/repcached.patch:1.1 Thu May 6 13:29:42 2010
+++ packages/memcached/repcached.patch Thu May 6 13:30:40 2010
@@ -13,178 +13,6 @@
memcached_CPPFLAGS = -DNDEBUG
memcached_debug_LDADD = @PROFILER_LDFLAGS@
diff -urN --exclude *.m4 memcached-1.4.4/Makefile.in repcached-2.2-1.4.4/Makefile.in
---- memcached-1.4.4/Makefile.in Fri Nov 27 09:34:57 2009
-+++ repcached-2.2-1.4.4/Makefile.in Wed Feb 10 19:12:15 2010
-@@ -41,13 +41,14 @@
- @BUILD_CACHE_TRUE at am__append_2 = cache.c
- @BUILD_SOLARIS_PRIVS_TRUE at am__append_3 = solaris_priv.c
- @ENABLE_SASL_TRUE at am__append_4 = sasl_defs.c
-- at BUILD_DTRACE_TRUE@am__append_5 = memcached_dtrace.h
-+ at ENABLE_REPLICATION_TRUE@am__append_5 = replication.h replication.c
- @BUILD_DTRACE_TRUE at am__append_6 = memcached_dtrace.h
-- at DTRACE_INSTRUMENT_OBJ_TRUE@am__append_7 = memcached_dtrace.o
-+ at BUILD_DTRACE_TRUE@am__append_7 = memcached_dtrace.h
- @DTRACE_INSTRUMENT_OBJ_TRUE at am__append_8 = memcached_dtrace.o
-- at DTRACE_INSTRUMENT_OBJ_TRUE@am__append_9 = memcached_debug_dtrace.o
-+ at DTRACE_INSTRUMENT_OBJ_TRUE@am__append_9 = memcached_dtrace.o
- @DTRACE_INSTRUMENT_OBJ_TRUE at am__append_10 = memcached_debug_dtrace.o
-- at DTRACE_INSTRUMENT_OBJ_TRUE@am__append_11 = memcached_dtrace.o memcached_debug_dtrace.o
-+ at DTRACE_INSTRUMENT_OBJ_TRUE@am__append_11 = memcached_debug_dtrace.o
-+ at DTRACE_INSTRUMENT_OBJ_TRUE@am__append_12 = memcached_dtrace.o memcached_debug_dtrace.o
- subdir = .
- DIST_COMMON = README $(am__configure_deps) $(pkginclude_HEADERS) \
- $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-@@ -70,34 +71,41 @@
- am__memcached_SOURCES_DIST = memcached.c memcached.h hash.c hash.h \
- slabs.c slabs.h items.c items.h assoc.c assoc.h thread.c \
- daemon.c stats.c stats.h util.c util.h trace.h cache.h \
-- sasl_defs.h cache.c solaris_priv.c sasl_defs.c
-+ sasl_defs.h cache.c solaris_priv.c sasl_defs.c replication.h \
-+ replication.c
- @BUILD_CACHE_TRUE at am__objects_1 = memcached-cache.$(OBJEXT)
- @BUILD_SOLARIS_PRIVS_TRUE at am__objects_2 = \
- @BUILD_SOLARIS_PRIVS_TRUE@ memcached-solaris_priv.$(OBJEXT)
- @ENABLE_SASL_TRUE at am__objects_3 = memcached-sasl_defs.$(OBJEXT)
-+ at ENABLE_REPLICATION_TRUE@am__objects_4 = \
-+ at ENABLE_REPLICATION_TRUE@ memcached-replication.$(OBJEXT)
- am_memcached_OBJECTS = memcached-memcached.$(OBJEXT) \
- memcached-hash.$(OBJEXT) memcached-slabs.$(OBJEXT) \
- memcached-items.$(OBJEXT) memcached-assoc.$(OBJEXT) \
- memcached-thread.$(OBJEXT) memcached-daemon.$(OBJEXT) \
- memcached-stats.$(OBJEXT) memcached-util.$(OBJEXT) \
-- $(am__objects_1) $(am__objects_2) $(am__objects_3)
-+ $(am__objects_1) $(am__objects_2) $(am__objects_3) \
-+ $(am__objects_4)
- memcached_OBJECTS = $(am_memcached_OBJECTS)
- am__memcached_debug_SOURCES_DIST = memcached.c memcached.h hash.c \
- hash.h slabs.c slabs.h items.c items.h assoc.c assoc.h \
- thread.c daemon.c stats.c stats.h util.c util.h trace.h \
-- cache.h sasl_defs.h cache.c solaris_priv.c sasl_defs.c
-- at BUILD_CACHE_TRUE@am__objects_4 = memcached_debug-cache.$(OBJEXT)
-- at BUILD_SOLARIS_PRIVS_TRUE@am__objects_5 = memcached_debug-solaris_priv.$(OBJEXT)
-- at ENABLE_SASL_TRUE@am__objects_6 = memcached_debug-sasl_defs.$(OBJEXT)
--am__objects_7 = memcached_debug-memcached.$(OBJEXT) \
-+ cache.h sasl_defs.h cache.c solaris_priv.c sasl_defs.c \
-+ replication.h replication.c
-+ at BUILD_CACHE_TRUE@am__objects_5 = memcached_debug-cache.$(OBJEXT)
-+ at BUILD_SOLARIS_PRIVS_TRUE@am__objects_6 = memcached_debug-solaris_priv.$(OBJEXT)
-+ at ENABLE_SASL_TRUE@am__objects_7 = memcached_debug-sasl_defs.$(OBJEXT)
-+ at ENABLE_REPLICATION_TRUE@am__objects_8 = memcached_debug-replication.$(OBJEXT)
-+am__objects_9 = memcached_debug-memcached.$(OBJEXT) \
- memcached_debug-hash.$(OBJEXT) memcached_debug-slabs.$(OBJEXT) \
- memcached_debug-items.$(OBJEXT) \
- memcached_debug-assoc.$(OBJEXT) \
- memcached_debug-thread.$(OBJEXT) \
- memcached_debug-daemon.$(OBJEXT) \
- memcached_debug-stats.$(OBJEXT) memcached_debug-util.$(OBJEXT) \
-- $(am__objects_4) $(am__objects_5) $(am__objects_6)
--am_memcached_debug_OBJECTS = $(am__objects_7)
-+ $(am__objects_5) $(am__objects_6) $(am__objects_7) \
-+ $(am__objects_8)
-+am_memcached_debug_OBJECTS = $(am__objects_9)
- memcached_debug_OBJECTS = $(am_memcached_debug_OBJECTS)
- memcached_debug_LINK = $(CCLD) $(memcached_debug_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
-@@ -105,8 +113,9 @@
- sizes_OBJECTS = sizes.$(OBJEXT)
- sizes_LDADD = $(LDADD)
- am__testapp_SOURCES_DIST = testapp.c util.c util.h cache.c
-- at BUILD_CACHE_TRUE@am__objects_8 = cache.$(OBJEXT)
--am_testapp_OBJECTS = testapp.$(OBJEXT) util.$(OBJEXT) $(am__objects_8)
-+ at BUILD_CACHE_TRUE@am__objects_10 = cache.$(OBJEXT)
-+am_testapp_OBJECTS = testapp.$(OBJEXT) util.$(OBJEXT) \
-+ $(am__objects_10)
- testapp_OBJECTS = $(am_testapp_OBJECTS)
- testapp_LDADD = $(LDADD)
- am_timedrun_OBJECTS = timedrun.$(OBJEXT)
-@@ -261,21 +270,22 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- pkginclude_HEADERS = protocol_binary.h
--BUILT_SOURCES = $(am__append_5)
-+BUILT_SOURCES = $(am__append_6)
- testapp_SOURCES = testapp.c util.c util.h $(am__append_2)
- timedrun_SOURCES = timedrun.c
- memcached_SOURCES = memcached.c memcached.h hash.c hash.h slabs.c \
- slabs.h items.c items.h assoc.c assoc.h thread.c daemon.c \
- stats.c stats.h util.c util.h trace.h cache.h sasl_defs.h \
-- $(am__append_1) $(am__append_3) $(am__append_4)
-+ $(am__append_1) $(am__append_3) $(am__append_4) \
-+ $(am__append_5)
- memcached_debug_SOURCES = $(memcached_SOURCES)
- memcached_CPPFLAGS = -DNDEBUG
--memcached_debug_LDADD = @PROFILER_LDFLAGS@ $(am__append_9)
-+memcached_debug_LDADD = @PROFILER_LDFLAGS@ $(am__append_10)
- memcached_debug_CFLAGS = @PROFILER_FLAGS@
--memcached_LDADD = $(am__append_7)
--memcached_DEPENDENCIES = $(am__append_8)
--memcached_debug_DEPENDENCIES = $(am__append_10)
--CLEANFILES = $(am__append_6) $(am__append_11)
-+memcached_LDADD = $(am__append_8)
-+memcached_DEPENDENCIES = $(am__append_9)
-+memcached_debug_DEPENDENCIES = $(am__append_11)
-+CLEANFILES = $(am__append_7) $(am__append_12)
- SUBDIRS = doc
- DIST_DIRS = scripts
- EXTRA_DIST = doc scripts t memcached.spec memcached_dtrace.d version.m4
-@@ -390,6 +400,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/memcached-hash.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/memcached-items.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/memcached-memcached.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/memcached-replication.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/memcached-sasl_defs.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/memcached-slabs.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/memcached-solaris_priv.Po at am__quote@
-@@ -402,6 +413,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/memcached_debug-hash.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/memcached_debug-items.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/memcached_debug-memcached.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/memcached_debug-replication.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/memcached_debug-sasl_defs.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/memcached_debug-slabs.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/memcached_debug-solaris_priv.Po at am__quote@
-@@ -595,6 +607,20 @@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(memcached_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o memcached-sasl_defs.obj `if test -f 'sasl_defs.c'; then $(CYGPATH_W) 'sasl_defs.c'; else $(CYGPATH_W) '$(srcdir)/sasl_defs.c'; fi`
-
-+memcached-replication.o: replication.c
-+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(memcached_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT memcached-replication.o -MD -MP -MF $(DEPDIR)/memcached-replication.Tpo -c -o memcached-replication.o `test -f 'replication.c' || echo '$(srcdir)/'`replication.c
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/memcached-replication.Tpo $(DEPDIR)/memcached-replication.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='replication.c' object='memcached-replication.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(memcached_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o memcached-replication.o `test -f 'replication.c' || echo '$(srcdir)/'`replication.c
-+
-+memcached-replication.obj: replication.c
-+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(memcached_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT memcached-replication.obj -MD -MP -MF $(DEPDIR)/memcached-replication.Tpo -c -o memcached-replication.obj `if test -f 'replication.c'; then $(CYGPATH_W) 'replication.c'; else $(CYGPATH_W) '$(srcdir)/replication.c'; fi`
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/memcached-replication.Tpo $(DEPDIR)/memcached-replication.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='replication.c' object='memcached-replication.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(memcached_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o memcached-replication.obj `if test -f 'replication.c'; then $(CYGPATH_W) 'replication.c'; else $(CYGPATH_W) '$(srcdir)/replication.c'; fi`
-+
- memcached_debug-memcached.o: memcached.c
- @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(memcached_debug_CFLAGS) $(CFLAGS) -MT memcached_debug-memcached.o -MD -MP -MF $(DEPDIR)/memcached_debug-memcached.Tpo -c -o memcached_debug-memcached.o `test -f 'memcached.c' || echo '$(srcdir)/'`memcached.c
- @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/memcached_debug-memcached.Tpo $(DEPDIR)/memcached_debug-memcached.Po
-@@ -762,6 +788,20 @@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sasl_defs.c' object='memcached_debug-sasl_defs.obj' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(memcached_debug_CFLAGS) $(CFLAGS) -c -o memcached_debug-sasl_defs.obj `if test -f 'sasl_defs.c'; then $(CYGPATH_W) 'sasl_defs.c'; else $(CYGPATH_W) '$(srcdir)/sasl_defs.c'; fi`
-+
-+memcached_debug-replication.o: replication.c
-+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(memcached_debug_CFLAGS) $(CFLAGS) -MT memcached_debug-replication.o -MD -MP -MF $(DEPDIR)/memcached_debug-replication.Tpo -c -o memcached_debug-replication.o `test -f 'replication.c' || echo '$(srcdir)/'`replication.c
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/memcached_debug-replication.Tpo $(DEPDIR)/memcached_debug-replication.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='replication.c' object='memcached_debug-replication.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(memcached_debug_CFLAGS) $(CFLAGS) -c -o memcached_debug-replication.o `test -f 'replication.c' || echo '$(srcdir)/'`replication.c
-+
-+memcached_debug-replication.obj: replication.c
-+ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(memcached_debug_CFLAGS) $(CFLAGS) -MT memcached_debug-replication.obj -MD -MP -MF $(DEPDIR)/memcached_debug-replication.Tpo -c -o memcached_debug-replication.obj `if test -f 'replication.c'; then $(CYGPATH_W) 'replication.c'; else $(CYGPATH_W) '$(srcdir)/replication.c'; fi`
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/memcached_debug-replication.Tpo $(DEPDIR)/memcached_debug-replication.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='replication.c' object='memcached_debug-replication.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(memcached_debug_CFLAGS) $(CFLAGS) -c -o memcached_debug-replication.obj `if test -f 'replication.c'; then $(CYGPATH_W) 'replication.c'; else $(CYGPATH_W) '$(srcdir)/replication.c'; fi`
- install-pkgincludeHEADERS: $(pkginclude_HEADERS)
- @$(NORMAL_INSTALL)
- test -z "$(pkgincludedir)" || $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)"
diff -urN --exclude *.m4 memcached-1.4.4/assoc.c repcached-2.2-1.4.4/assoc.c
--- memcached-1.4.4/assoc.c Sat Oct 24 00:38:01 2009
+++ repcached-2.2-1.4.4/assoc.c Tue Feb 9 23:02:45 2010
@@ -251,1401 +79,6 @@
+char *assoc_key_snap(int *n);
+#endif /*USE_REPLICATION*/
diff -urN --exclude *.m4 memcached-1.4.4/config.guess repcached-2.2-1.4.4/config.guess
---- memcached-1.4.4/config.guess Sat Aug 22 04:38:32 2009
-+++ repcached-2.2-1.4.4/config.guess Tue Jan 19 12:34:08 2010
-@@ -1,10 +1,9 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
--# Free Software Foundation, Inc.
-+# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
--timestamp='2008-09-28'
-+timestamp='2003-07-02'
-
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -18,15 +17,13 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
--# 02110-1301, USA.
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
-
--
- # Originally written by Per Bothner <per at bothner.com>.
- # Please send patches to <config-patches at gnu.org>. Submit a context
- # diff and a properly formatted ChangeLog entry.
-@@ -56,8 +53,8 @@
- GNU config.guess ($timestamp)
-
- Originally written by Per Bothner.
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
--2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-+Free Software Foundation, Inc.
-
- This is free software; see the source for copying conditions. There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -69,11 +66,11 @@
- while test $# -gt 0 ; do
- case $1 in
- --time-stamp | --time* | -t )
-- echo "$timestamp" ; exit ;;
-+ echo "$timestamp" ; exit 0 ;;
- --version | -v )
-- echo "$version" ; exit ;;
-+ echo "$version" ; exit 0 ;;
- --help | --h* | -h )
-- echo "$usage"; exit ;;
-+ echo "$usage"; exit 0 ;;
- -- ) # Stop option processing
- shift; break ;;
- - ) # Use stdin as input.
-@@ -107,7 +104,7 @@
- trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
- trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
- : ${TMPDIR=/tmp} ;
-- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
-+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-@@ -126,7 +123,7 @@
- ;;
- ,,*) CC_FOR_BUILD=$CC ;;
- ,*,*) CC_FOR_BUILD=$HOST_CC ;;
--esac ; set_cc_for_build= ;'
-+esac ;'
-
- # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
- # (ghazi at noc.rutgers.edu 1994-08-24)
-@@ -139,23 +136,6 @@
- UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
- UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
--if [ "${UNAME_SYSTEM}" = "Linux" ] ; then
-- eval $set_cc_for_build
-- cat << EOF > $dummy.c
-- #include <features.h>
-- #ifdef __UCLIBC__
-- # ifdef __UCLIBC_CONFIG_VERSION__
-- LIBC=uclibc __UCLIBC_CONFIG_VERSION__
-- # else
-- LIBC=uclibc
-- # endif
-- #else
-- LIBC=gnu
-- #endif
--EOF
-- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'`
--fi
--
- # Note: order is significant - the case branches are not exclusive.
-
- case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-@@ -178,7 +158,6 @@
- arm*) machine=arm-unknown ;;
- sh3el) machine=shl-unknown ;;
- sh3eb) machine=sh-unknown ;;
-- sh5el) machine=sh5le-unknown ;;
- *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
- esac
- # The Operating System including object format, if it has switched
-@@ -217,32 +196,50 @@
- # contains redundant information, the shorter form:
- # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- echo "${machine}-${os}${release}"
-- exit ;;
-+ exit 0 ;;
-+ amiga:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ arc:OpenBSD:*:*)
-+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ hp300:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ mac68k:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ macppc:OpenBSD:*:*)
-+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ mvme68k:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ mvme88k:OpenBSD:*:*)
-+ echo m88k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ mvmeppc:OpenBSD:*:*)
-+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ pmax:OpenBSD:*:*)
-+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ sgi:OpenBSD:*:*)
-+ echo mipseb-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ sun3:OpenBSD:*:*)
-+ echo m68k-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
-+ wgrisc:OpenBSD:*:*)
-+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
- *:OpenBSD:*:*)
-- UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-- echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-- exit ;;
-- *:ekkoBSD:*:*)
-- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-- exit ;;
-- *:SolidBSD:*:*)
-- echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-- exit ;;
-- macppc:MirBSD:*:*)
-- echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-- exit ;;
-- *:MirBSD:*:*)
-- echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-- exit ;;
-+ echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
- alpha:OSF1:*:*)
-- case $UNAME_RELEASE in
-- *4.0)
-+ if test $UNAME_RELEASE = "V4.0"; then
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-- ;;
-- *5.*)
-- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-- ;;
-- esac
-+ fi
- # According to Compaq, /usr/sbin/psrinfo has been available on
- # OSF/1 and Tru64 systems produced since 1995. I hope that
- # covers most systems running today. This code pipes the CPU
-@@ -280,49 +277,42 @@
- "EV7.9 (21364A)")
- UNAME_MACHINE="alphaev79" ;;
- esac
-- # A Pn.n version is a patched version.
- # A Vn.n version is a released version.
- # A Tn.n version is a released field test version.
- # A Xn.n version is an unreleased experimental baselevel.
- # 1.2 uses "1.2" for uname -r.
-- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-- exit ;;
-+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+ exit 0 ;;
-+ Alpha*:OpenVMS:*:*)
-+ echo alpha-hp-vms
-+ exit 0 ;;
- Alpha\ *:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # Should we change UNAME_MACHINE based on the output of uname instead
- # of the specific Alpha model?
- echo alpha-pc-interix
-- exit ;;
-+ exit 0 ;;
- 21064:Windows_NT:50:3)
- echo alpha-dec-winnt3.5
-- exit ;;
-+ exit 0 ;;
- Amiga*:UNIX_System_V:4.0:*)
- echo m68k-unknown-sysv4
-- exit ;;
-+ exit 0;;
- *:[Aa]miga[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-unknown-amigaos
-- exit ;;
-+ exit 0 ;;
- *:[Mm]orph[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-unknown-morphos
-- exit ;;
-+ exit 0 ;;
- *:OS/390:*:*)
- echo i370-ibm-openedition
-- exit ;;
-- *:z/VM:*:*)
-- echo s390-ibm-zvmoe
-- exit ;;
-- *:OS400:*:*)
-- echo powerpc-ibm-os400
-- exit ;;
-+ exit 0 ;;
- arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- echo arm-acorn-riscix${UNAME_RELEASE}
-- exit ;;
-- arm:riscos:*:*|arm:RISCOS:*:*)
-- echo arm-unknown-riscos
-- exit ;;
-+ exit 0;;
- SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
- echo hppa1.1-hitachi-hiuxmpp
-- exit ;;
-+ exit 0;;
- Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
- # akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
- if test "`(/bin/universe) 2>/dev/null`" = att ; then
-@@ -330,32 +320,32 @@
- else
- echo pyramid-pyramid-bsd
- fi
-- exit ;;
-+ exit 0 ;;
- NILE*:*:*:dcosx)
- echo pyramid-pyramid-svr4
-- exit ;;
-+ exit 0 ;;
- DRS?6000:unix:4.0:6*)
- echo sparc-icl-nx6
-- exit ;;
-- DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-+ exit 0 ;;
-+ DRS?6000:UNIX_SV:4.2*:7*)
- case `/usr/bin/uname -p` in
-- sparc) echo sparc-icl-nx7; exit ;;
-+ sparc) echo sparc-icl-nx7 && exit 0 ;;
- esac ;;
- sun4H:SunOS:5.*:*)
- echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-- exit ;;
-+ exit 0 ;;
- sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-- exit ;;
-- i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-+ exit 0 ;;
-+ i86pc:SunOS:5.*:*)
- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-- exit ;;
-+ exit 0 ;;
- sun4*:SunOS:6*:*)
- # According to config.sub, this is the proper way to canonicalize
- # SunOS6. Hard to guess exactly what SunOS6 will be like, but
- # it's likely to be more like Solaris than SunOS4.
- echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-- exit ;;
-+ exit 0 ;;
- sun4*:SunOS:*:*)
- case "`/usr/bin/arch -k`" in
- Series*|S4*)
-@@ -364,10 +354,10 @@
- esac
- # Japanese Language versions have a version number like `4.1.3-JL'.
- echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-- exit ;;
-+ exit 0 ;;
- sun3*:SunOS:*:*)
- echo m68k-sun-sunos${UNAME_RELEASE}
-- exit ;;
-+ exit 0 ;;
- sun*:*:4.2BSD:*)
- UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
- test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-@@ -379,10 +369,10 @@
- echo sparc-sun-sunos${UNAME_RELEASE}
- ;;
- esac
-- exit ;;
-+ exit 0 ;;
- aushp:SunOS:*:*)
- echo sparc-auspex-sunos${UNAME_RELEASE}
-- exit ;;
-+ exit 0 ;;
- # The situation for MiNT is a little confusing. The machine name
- # can be virtually everything (everything which is not
- # "atarist" or "atariste" at least should have a processor
-@@ -393,40 +383,37 @@
- # be no problem.
- atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
-- exit ;;
-+ exit 0 ;;
- atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
-- exit ;;
-+ exit 0 ;;
- *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
-- exit ;;
-+ exit 0 ;;
- milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
- echo m68k-milan-mint${UNAME_RELEASE}
-- exit ;;
-+ exit 0 ;;
- hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
- echo m68k-hades-mint${UNAME_RELEASE}
-- exit ;;
-+ exit 0 ;;
- *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
-- exit ;;
-- m68k:machten:*:*)
-- echo m68k-apple-machten${UNAME_RELEASE}
-- exit ;;
-+ exit 0 ;;
- powerpc:machten:*:*)
- echo powerpc-apple-machten${UNAME_RELEASE}
-- exit ;;
-+ exit 0 ;;
- RISC*:Mach:*:*)
- echo mips-dec-mach_bsd4.3
-- exit ;;
-+ exit 0 ;;
- RISC*:ULTRIX:*:*)
- echo mips-dec-ultrix${UNAME_RELEASE}
-- exit ;;
-+ exit 0 ;;
- VAX*:ULTRIX*:*:*)
- echo vax-dec-ultrix${UNAME_RELEASE}
-- exit ;;
-+ exit 0 ;;
- 2020:CLIX:*:* | 2430:CLIX:*:*)
- echo clipper-intergraph-clix${UNAME_RELEASE}
-- exit ;;
-+ exit 0 ;;
- mips:*:*:UMIPS | mips:*:*:RISCos)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
-@@ -450,33 +437,32 @@
- exit (-1);
- }
- EOF
-- $CC_FOR_BUILD -o $dummy $dummy.c &&
-- dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-- SYSTEM_NAME=`$dummy $dummyarg` &&
-- { echo "$SYSTEM_NAME"; exit; }
-+ $CC_FOR_BUILD -o $dummy $dummy.c \
-+ && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-+ && exit 0
- echo mips-mips-riscos${UNAME_RELEASE}
-- exit ;;
-+ exit 0 ;;
- Motorola:PowerMAX_OS:*:*)
- echo powerpc-motorola-powermax
-- exit ;;
-+ exit 0 ;;
- Motorola:*:4.3:PL8-*)
- echo powerpc-harris-powermax
-- exit ;;
-+ exit 0 ;;
- Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
- echo powerpc-harris-powermax
-- exit ;;
-+ exit 0 ;;
- Night_Hawk:Power_UNIX:*:*)
- echo powerpc-harris-powerunix
-- exit ;;
-+ exit 0 ;;
- m88k:CX/UX:7*:*)
- echo m88k-harris-cxux7
-- exit ;;
-+ exit 0 ;;
- m88k:*:4*:R4*)
- echo m88k-motorola-sysv4
-- exit ;;
-+ exit 0 ;;
- m88k:*:3*:R3*)
- echo m88k-motorola-sysv3
-- exit ;;
-+ exit 0 ;;
- AViiON:dgux:*:*)
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/memcached/repcached.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list