[csw-devel] SF.net SVN: gar:[3739] csw/mgar/pkg/git/trunk
bdwalton at users.sourceforge.net
bdwalton at users.sourceforge.net
Thu Mar 12 20:25:06 CET 2009
Revision: 3739
http://gar.svn.sourceforge.net/gar/?rev=3739&view=rev
Author: bdwalton
Date: 2009-03-12 19:25:06 +0000 (Thu, 12 Mar 2009)
Log Message:
-----------
- Add patches to fix autoconf support (mainly to get proper pthread support)
- Switch to suncc
- Specifically set a few more configure args (shouldn't be needed, but
they better document what will happen)
Modified Paths:
--------------
csw/mgar/pkg/git/trunk/Makefile
csw/mgar/pkg/git/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/git/trunk/files/0001-configure-ensure-settings-from-user-are-also-usable.patch
csw/mgar/pkg/git/trunk/files/0002-configure-reorganize-flow-of-argument-checks.patch
csw/mgar/pkg/git/trunk/files/0003-configure-add-macros-to-stash-FLAG-variables.patch
csw/mgar/pkg/git/trunk/files/0004-configure-wrap-some-library-tests-with-GIT_STASH_FL.patch
csw/mgar/pkg/git/trunk/files/0005-configure-asciidoc-version-test-cleanup.patch
csw/mgar/pkg/git/trunk/files/0006-configure-make-iconv-tests-aware-of-user-arguments.patch
csw/mgar/pkg/git/trunk/files/0007-configure-rework-pthread-handling-to-allow-for-user.patch
Modified: csw/mgar/pkg/git/trunk/Makefile
===================================================================
--- csw/mgar/pkg/git/trunk/Makefile 2009-03-12 18:50:25 UTC (rev 3738)
+++ csw/mgar/pkg/git/trunk/Makefile 2009-03-12 19:25:06 UTC (rev 3739)
@@ -57,6 +57,13 @@
GIT_TREEISH_git.git = v$(GARVERSION)
PATCHFILES = doc-makefile.patch
+PATCHFILES += 0001-configure-ensure-settings-from-user-are-also-usable.patch
+PATCHFILES += 0002-configure-reorganize-flow-of-argument-checks.patch
+PATCHFILES += 0003-configure-add-macros-to-stash-FLAG-variables.patch
+PATCHFILES += 0004-configure-wrap-some-library-tests-with-GIT_STASH_FL.patch
+PATCHFILES += 0005-configure-asciidoc-version-test-cleanup.patch
+PATCHFILES += 0006-configure-make-iconv-tests-aware-of-user-arguments.patch
+PATCHFILES += 0007-configure-rework-pthread-handling-to-allow-for-user.patch
PKGFILES_CSWgitsvn = .*svn.*
PKGFILES_CSWgitgui = .*git-gui.* .*git-citool.*
@@ -69,13 +76,14 @@
# software release
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
-GARCOMPILER = GNU
-
CONFIGURE_ARGS = $(DIRPATHS) --with-shell=$(bindir)/bash
CONFIGURE_ARGS += --with-perl=$(bindir)/perl
CONFIGURE_ARGS += --with-tcltk=$(bindir)/wish
CONFIGURE_ARGS += --with-zlib=$(prefix)
CONFIGURE_ARGS += --with-iconv=$(prefix)
+CONFIGURE_ARGS += --with-openssl=$(prefix)
+CONFIGURE_ARGS += --with-expat=$(prefix)
+CONFIGURE_ARGS += --enable-pthreads="-D_REENTRANT -lpthread"
BUILD_ARGS = MSGFMT=gmsgfmt SHELL_PATH=/opt/csw/bin/bash \
ETC_CONFIG=$(sysconfdir)/gitconfig V=1 \
Modified: csw/mgar/pkg/git/trunk/checksums
===================================================================
--- csw/mgar/pkg/git/trunk/checksums 2009-03-12 18:50:25 UTC (rev 3738)
+++ csw/mgar/pkg/git/trunk/checksums 2009-03-12 19:25:06 UTC (rev 3739)
@@ -1,3 +1,8 @@
075441ea2a95cfa5fd7aaebb888a93f3 download/doc-makefile.patch
-97290254ce2e9e6c37fdd824140fda85 download/0001-git-svn-fix-to-avoid-using-strftime-z.patch
-1081a8ca474317f1963e0d1ee69832de download/0002-git-svn-return-original-format_svn_date-semantics.patch
+d88d34fc8e4ce18fe738753a06417eac download/0001-configure-ensure-settings-from-user-are-also-usable.patch
+9f1f5c3f7759319d647420d330f87c28 download/0002-configure-reorganize-flow-of-argument-checks.patch
+dc54bd8c79b58724eaab77e15f9e2029 download/0003-configure-add-macros-to-stash-FLAG-variables.patch
+b1c0911b53bcccb943b1f7bdc6db5237 download/0004-configure-wrap-some-library-tests-with-GIT_STASH_FL.patch
+50fa0de30bbc019e6c5e43c20cef423a download/0005-configure-asciidoc-version-test-cleanup.patch
+cde5cd3ceebe13864dd8e3718e104387 download/0006-configure-make-iconv-tests-aware-of-user-arguments.patch
+89dbcc3180bf4e651e9e64d4de3f6df0 download/0007-configure-rework-pthread-handling-to-allow-for-user.patch
Added: csw/mgar/pkg/git/trunk/files/0001-configure-ensure-settings-from-user-are-also-usable.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0001-configure-ensure-settings-from-user-are-also-usable.patch (rev 0)
+++ csw/mgar/pkg/git/trunk/files/0001-configure-ensure-settings-from-user-are-also-usable.patch 2009-03-12 19:25:06 UTC (rev 3739)
@@ -0,0 +1,56 @@
+From 63b740b85248d3ff5a2a458cc5068f5e2c180f0d Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at artsci.utoronto.ca>
+Date: Thu, 12 Mar 2009 17:30:56 +0100
+Subject: [PATCH] configure: ensure settings from user are also usable in the script
+
+Allow things set by the user (--with-lib, --with-iconv, etc) to set
+variables for use by other parts of the script. Display values as
+they're set.
+
+Signed-off-by: Ben Walton <bwalton at artsci.utoronto.ca>
+---
+ configure.ac | 11 +++++++++++
+ 1 files changed, 11 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 082a03d..0b314d7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -42,6 +42,8 @@ else \
+ if test "$withval" = "yes"; then \
+ AC_MSG_WARN([You should provide path for --with-$1=PATH]); \
+ else \
++ m4_toupper($1)_PATH=$withval; \
++ AC_MSG_NOTICE([Setting m4_toupper($1)_PATH to $withval]); \
+ GIT_CONF_APPEND_LINE(${PROGRAM}_PATH=$withval); \
+ fi; \
+ fi; \
+@@ -61,6 +63,8 @@ elif test "$withval" = "yes"; then \
+ m4_toupper(NO_$1)=; \
+ else \
+ m4_toupper(NO_$1)=; \
++ m4_toupper($1)DIR=$withval; \
++ AC_MSG_NOTICE([Setting m4_toupper($1)DIR to $withval]); \
+ GIT_CONF_APPEND_LINE(${PACKAGE}DIR=$withval); \
+ fi \
+ ])# GIT_PARSE_WITH
+@@ -86,9 +90,16 @@ AC_ARG_WITH([lib],
+ [if test "$withval" = "no" || test "$withval" = "yes"; then \
+ AC_MSG_WARN([You should provide name for --with-lib=ARG]); \
+ else \
++ lib=$withval; \
++ AC_MSG_NOTICE([Setting lib to '$lib']); \
+ GIT_CONF_APPEND_LINE(lib=$withval); \
+ fi; \
+ ],[])
++
++if test -z "$lib"; then
++ AC_MSG_NOTICE([Setting lib to 'lib' (the default)])
++ lib=lib
++fi
+ #
+ # Define SHELL_PATH to provide path to shell.
+ GIT_ARG_SET_PATH(shell)
+--
+1.6.0.5
+
Added: csw/mgar/pkg/git/trunk/files/0002-configure-reorganize-flow-of-argument-checks.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0002-configure-reorganize-flow-of-argument-checks.patch (rev 0)
+++ csw/mgar/pkg/git/trunk/files/0002-configure-reorganize-flow-of-argument-checks.patch 2009-03-12 19:25:06 UTC (rev 3739)
@@ -0,0 +1,212 @@
+From 142c46f4db8f7d32ed455316704503fca2bf4857 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at artsci.utoronto.ca>
+Date: Thu, 12 Mar 2009 17:33:38 +0100
+Subject: [PATCH] configure: reorganize flow of argument checks
+
+Move the argument tests from the 'site overrides' so that they are
+ahead of any library tests. This allows for library tests to take
+user specified paths into account. The intent here is to avoid things
+like NO_DEFLATE_BOUND being set due to finding old zlib when the user
+has specified an alternate location for zlib. (Ignore the fact that
+properly set *FLAGS can avoid solve this issue.)
+
+Signed-off-by: Ben Walton <bwalton at artsci.utoronto.ca>
+---
+ configure.ac | 174 +++++++++++++++++++++++++++++-----------------------------
+ 1 files changed, 87 insertions(+), 87 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0b314d7..0bff480 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -100,6 +100,93 @@ if test -z "$lib"; then
+ AC_MSG_NOTICE([Setting lib to 'lib' (the default)])
+ lib=lib
+ fi
++
++## Site configuration (override autodetection)
++## --with-PACKAGE[=ARG] and --without-PACKAGE
++AC_MSG_NOTICE([CHECKS for site configuration])
++#
++# Define NO_SVN_TESTS if you want to skip time-consuming SVN interoperability
++# tests. These tests take up a significant amount of the total test time
++# but are not needed unless you plan to talk to SVN repos.
++#
++# Define MOZILLA_SHA1 environment variable when running make to make use of
++# a bundled SHA1 routine coming from Mozilla. It is GPL'd and should be fast
++# on non-x86 architectures (e.g. PowerPC), while the OpenSSL version (default
++# choice) has very fast version optimized for i586.
++#
++# Define PPC_SHA1 environment variable when running make to make use of
++# a bundled SHA1 routine optimized for PowerPC.
++#
++# Define ARM_SHA1 environment variable when running make to make use of
++# a bundled SHA1 routine optimized for ARM.
++#
++# Define NO_OPENSSL environment variable if you do not have OpenSSL.
++# This also implies MOZILLA_SHA1.
++#
++# Define OPENSSLDIR=/foo/bar if your openssl header and library files are in
++# /foo/bar/include and /foo/bar/lib directories.
++AC_ARG_WITH(openssl,
++AS_HELP_STRING([--with-openssl],[use OpenSSL library (default is YES)])
++AS_HELP_STRING([], [ARG can be prefix for openssl library and headers]),\
++GIT_PARSE_WITH(openssl))
++#
++# Define NO_CURL if you do not have curl installed. git-http-pull and
++# git-http-push are not built, and you cannot use http:// and https://
++# transports.
++#
++# Define CURLDIR=/foo/bar if your curl header and library files are in
++# /foo/bar/include and /foo/bar/lib directories.
++AC_ARG_WITH(curl,
++AS_HELP_STRING([--with-curl],[support http(s):// transports (default is YES)])
++AS_HELP_STRING([], [ARG can be also prefix for curl library and headers]),
++GIT_PARSE_WITH(curl))
++#
++# Define NO_EXPAT if you do not have expat installed. git-http-push is
++# not built, and you cannot push using http:// and https:// transports.
++#
++# Define EXPATDIR=/foo/bar if your expat header and library files are in
++# /foo/bar/include and /foo/bar/lib directories.
++AC_ARG_WITH(expat,
++AS_HELP_STRING([--with-expat],
++[support git-push using http:// and https:// transports via WebDAV (default is YES)])
++AS_HELP_STRING([], [ARG can be also prefix for expat library and headers]),
++GIT_PARSE_WITH(expat))
++#
++# Define NO_FINK if you are building on Darwin/Mac OS X, have Fink
++# installed in /sw, but don't want GIT to link against any libraries
++# installed there. If defined you may specify your own (or Fink's)
++# include directories and library directories by defining CFLAGS
++# and LDFLAGS appropriately.
++#
++# Define NO_DARWIN_PORTS if you are building on Darwin/Mac OS X,
++# have DarwinPorts installed in /opt/local, but don't want GIT to
++# link against any libraries installed there. If defined you may
++# specify your own (or DarwinPort's) include directories and
++# library directories by defining CFLAGS and LDFLAGS appropriately.
++#
++# Define NO_MMAP if you want to avoid mmap.
++#
++# Define NO_ICONV if your libc does not properly support iconv.
++AC_ARG_WITH(iconv,
++AS_HELP_STRING([--without-iconv],
++[if your architecture doesn't properly support iconv])
++AS_HELP_STRING([--with-iconv=PATH],
++[PATH is prefix for libiconv library and headers])
++AS_HELP_STRING([],
++[used only if you need linking with libiconv]),
++GIT_PARSE_WITH(iconv))
++
++## --enable-FEATURE[=ARG] and --disable-FEATURE
++#
++# Define USE_NSEC below if you want git to care about sub-second file mtimes
++# and ctimes. Note that you need recent glibc (at least 2.2.4) for this, and
++# it will BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely
++# randomly break unless your underlying filesystem supports those sub-second
++# times (my ext3 doesn't).
++#
++# Define USE_STDEV below if you want git to care about the underlying device
++# change being considered an inode change from the update-index perspective.
++
+ #
+ # Define SHELL_PATH to provide path to shell.
+ GIT_ARG_SET_PATH(shell)
+@@ -526,93 +613,6 @@ AC_SUBST(PTHREAD_LIBS)
+ AC_SUBST(NO_PTHREADS)
+ AC_SUBST(THREADED_DELTA_SEARCH)
+
+-## Site configuration (override autodetection)
+-## --with-PACKAGE[=ARG] and --without-PACKAGE
+-AC_MSG_NOTICE([CHECKS for site configuration])
+-#
+-# Define NO_SVN_TESTS if you want to skip time-consuming SVN interoperability
+-# tests. These tests take up a significant amount of the total test time
+-# but are not needed unless you plan to talk to SVN repos.
+-#
+-# Define MOZILLA_SHA1 environment variable when running make to make use of
+-# a bundled SHA1 routine coming from Mozilla. It is GPL'd and should be fast
+-# on non-x86 architectures (e.g. PowerPC), while the OpenSSL version (default
+-# choice) has very fast version optimized for i586.
+-#
+-# Define PPC_SHA1 environment variable when running make to make use of
+-# a bundled SHA1 routine optimized for PowerPC.
+-#
+-# Define ARM_SHA1 environment variable when running make to make use of
+-# a bundled SHA1 routine optimized for ARM.
+-#
+-# Define NO_OPENSSL environment variable if you do not have OpenSSL.
+-# This also implies MOZILLA_SHA1.
+-#
+-# Define OPENSSLDIR=/foo/bar if your openssl header and library files are in
+-# /foo/bar/include and /foo/bar/lib directories.
+-AC_ARG_WITH(openssl,
+-AS_HELP_STRING([--with-openssl],[use OpenSSL library (default is YES)])
+-AS_HELP_STRING([], [ARG can be prefix for openssl library and headers]),\
+-GIT_PARSE_WITH(openssl))
+-#
+-# Define NO_CURL if you do not have curl installed. git-http-pull and
+-# git-http-push are not built, and you cannot use http:// and https://
+-# transports.
+-#
+-# Define CURLDIR=/foo/bar if your curl header and library files are in
+-# /foo/bar/include and /foo/bar/lib directories.
+-AC_ARG_WITH(curl,
+-AS_HELP_STRING([--with-curl],[support http(s):// transports (default is YES)])
+-AS_HELP_STRING([], [ARG can be also prefix for curl library and headers]),
+-GIT_PARSE_WITH(curl))
+-#
+-# Define NO_EXPAT if you do not have expat installed. git-http-push is
+-# not built, and you cannot push using http:// and https:// transports.
+-#
+-# Define EXPATDIR=/foo/bar if your expat header and library files are in
+-# /foo/bar/include and /foo/bar/lib directories.
+-AC_ARG_WITH(expat,
+-AS_HELP_STRING([--with-expat],
+-[support git-push using http:// and https:// transports via WebDAV (default is YES)])
+-AS_HELP_STRING([], [ARG can be also prefix for expat library and headers]),
+-GIT_PARSE_WITH(expat))
+-#
+-# Define NO_FINK if you are building on Darwin/Mac OS X, have Fink
+-# installed in /sw, but don't want GIT to link against any libraries
+-# installed there. If defined you may specify your own (or Fink's)
+-# include directories and library directories by defining CFLAGS
+-# and LDFLAGS appropriately.
+-#
+-# Define NO_DARWIN_PORTS if you are building on Darwin/Mac OS X,
+-# have DarwinPorts installed in /opt/local, but don't want GIT to
+-# link against any libraries installed there. If defined you may
+-# specify your own (or DarwinPort's) include directories and
+-# library directories by defining CFLAGS and LDFLAGS appropriately.
+-#
+-# Define NO_MMAP if you want to avoid mmap.
+-#
+-# Define NO_ICONV if your libc does not properly support iconv.
+-AC_ARG_WITH(iconv,
+-AS_HELP_STRING([--without-iconv],
+-[if your architecture doesn't properly support iconv])
+-AS_HELP_STRING([--with-iconv=PATH],
+-[PATH is prefix for libiconv library and headers])
+-AS_HELP_STRING([],
+-[used only if you need linking with libiconv]),
+-GIT_PARSE_WITH(iconv))
+-
+-## --enable-FEATURE[=ARG] and --disable-FEATURE
+-#
+-# Define USE_NSEC below if you want git to care about sub-second file mtimes
+-# and ctimes. Note that you need recent glibc (at least 2.2.4) for this, and
+-# it will BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely
+-# randomly break unless your underlying filesystem supports those sub-second
+-# times (my ext3 doesn't).
+-#
+-# Define USE_STDEV below if you want git to care about the underlying device
+-# change being considered an inode change from the update-index perspective.
+-
+-
+ ## Output files
+ AC_CONFIG_FILES(["${config_file}":"${config_in}":"${config_append}"])
+ AC_OUTPUT
+--
+1.6.0.5
+
Added: csw/mgar/pkg/git/trunk/files/0003-configure-add-macros-to-stash-FLAG-variables.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0003-configure-add-macros-to-stash-FLAG-variables.patch (rev 0)
+++ csw/mgar/pkg/git/trunk/files/0003-configure-add-macros-to-stash-FLAG-variables.patch 2009-03-12 19:25:06 UTC (rev 3739)
@@ -0,0 +1,54 @@
+From 620f4827cf3e2899fe9ffd7245f87bb558446832 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at artsci.utoronto.ca>
+Date: Wed, 11 Mar 2009 16:59:22 +0100
+Subject: [PATCH] configure: add macros to stash FLAG variables
+
+Allow for quick stash/unstash of CPPFLAGS and LDFLAGS. Library tests
+can now be easily bracketted with these macros to allow for values
+set in user/site arguments.
+
+Signed-off-by: Ben Walton <bwalton at artsci.utoronto.ca>
+---
+ configure.ac | 26 ++++++++++++++++++++++++++
+ 1 files changed, 26 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0bff480..469c9a9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -80,6 +80,32 @@ AC_DEFUN([GIT_CHECK_FUNC],[AC_CHECK_FUNC([$1],[
+ AC_SEARCH_LIBS([$1],,
+ [$2],[$3])
+ ],[$3])])
++
++dnl
++dnl GIT_STASH_FLAGS(BASEPATH_VAR)
++dnl -----------------------------
++dnl Allow for easy stashing of LDFLAGS and CPPFLAGS before running
++dnl tests that may want to take user settings into account.
++AC_DEFUN([GIT_STASH_FLAGS],[
++if test -n "$1"; then
++ old_CPPFLAGS="$CPPFLAGS"
++ old_LDFLAGS="$LDFLAGS"
++ CPPFLAGS="-I$1/include $CPPFLAGS"
++ LDFLAGS="-L$1/$lib $LDFLAGS"
++fi
++])
++
++dnl
++dnl GIT_UNSTASH_FLAGS(BASEPATH_VAR)
++dnl -----------------------------
++dnl Restore the stashed *FLAGS values.
++AC_DEFUN([GIT_UNSTASH_FLAGS],[
++if test -n "$1"; then
++ CPPFLAGS="$old_CPPFLAGS"
++ LDFLAGS="$old_LDFLAGS"
++fi
++])
++
+ ## Site configuration related to programs (before tests)
+ ## --with-PACKAGE[=ARG] and --without-PACKAGE
+ #
+--
+1.6.0.5
+
Added: csw/mgar/pkg/git/trunk/files/0004-configure-wrap-some-library-tests-with-GIT_STASH_FL.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0004-configure-wrap-some-library-tests-with-GIT_STASH_FL.patch (rev 0)
+++ csw/mgar/pkg/git/trunk/files/0004-configure-wrap-some-library-tests-with-GIT_STASH_FL.patch 2009-03-12 19:25:06 UTC (rev 3739)
@@ -0,0 +1,113 @@
+From 412626c9183b5109e04826c9ce8033636258ee91 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at artsci.utoronto.ca>
+Date: Wed, 11 Mar 2009 17:22:45 +0100
+Subject: [PATCH] configure: wrap some library tests with GIT_STASH_FLAGS
+
+Libraries that can have user specificed base paths are wrapped with
+GIT_STASH_FLAGS/GIT_UNSTASH_FLAGS to ensure that the proper versions
+on the system are tested. This ensures, for example, that the zlib
+tests for deflateUnbound are done with the version of zlib requested
+by the user. This is most useful in the absence of good settings for
+CPPFLAGS and/or LDFLAGS.
+
+Signed-off-by: Ben Walton <bwalton at artsci.utoronto.ca>
+---
+ configure.ac | 36 +++++++++++++++++++++++++++++++++++-
+ 1 files changed, 35 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 469c9a9..fe9d7eb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -315,33 +315,57 @@ AC_MSG_NOTICE([CHECKS for libraries])
+ #
+ # Define NO_OPENSSL environment variable if you do not have OpenSSL.
+ # Define NEEDS_SSL_WITH_CRYPTO if you need -lcrypto with -lssl (Darwin).
++
++GIT_STASH_FLAGS($OPENSSLDIR)
++
+ AC_CHECK_LIB([crypto], [SHA1_Init],
+ [NEEDS_SSL_WITH_CRYPTO=],
+ [AC_CHECK_LIB([ssl], [SHA1_Init],
+ [NEEDS_SSL_WITH_CRYPTO=YesPlease
+ NEEDS_SSL_WITH_CRYPTO=],
+ [NO_OPENSSL=YesPlease])])
++
++GIT_UNSTASH_FLAGS($OPENSSLDIR)
++
+ AC_SUBST(NEEDS_SSL_WITH_CRYPTO)
+ AC_SUBST(NO_OPENSSL)
++
+ #
+ # Define NO_CURL if you do not have libcurl installed. git-http-pull and
+ # git-http-push are not built, and you cannot use http:// and https://
+ # transports.
++
++GIT_STASH_FLAGS($CURLDIR)
++
+ AC_CHECK_LIB([curl], [curl_global_init],
+ [NO_CURL=],
+ [NO_CURL=YesPlease])
++
++GIT_UNSTASH_FLAGS($CURLDIR)
++
+ AC_SUBST(NO_CURL)
++
+ #
+ # Define NO_EXPAT if you do not have expat installed. git-http-push is
+ # not built, and you cannot push using http:// and https:// transports.
++
++GIT_STASH_FLAGS($EXPATDIR)
++
+ AC_CHECK_LIB([expat], [XML_ParserCreate],
+ [NO_EXPAT=],
+ [NO_EXPAT=YesPlease])
++
++GIT_UNSTASH_FLAGS($EXPATDIR)
++
+ AC_SUBST(NO_EXPAT)
++
+ #
+ # Define NEEDS_LIBICONV if linking with libc is not enough (Darwin and
+ # some Solaris installations).
+ # Define NO_ICONV if neither libc nor libiconv support iconv.
++
++GIT_STASH_FLAGS($ICONVDIR)
++
+ AC_DEFUN([ICONVTEST_SRC], [
+ #include <iconv.h>
+
+@@ -365,11 +389,17 @@ AC_LINK_IFELSE(ICONVTEST_SRC,
+ [AC_MSG_RESULT([no])
+ NO_ICONV=YesPlease])
+ LIBS="$old_LIBS"])
++
++GIT_UNSTASH_FLAGS($ICONVDIR)
++
+ AC_SUBST(NEEDS_LIBICONV)
+ AC_SUBST(NO_ICONV)
+-test -n "$NEEDS_LIBICONV" && LIBS="$LIBS -liconv"
++
+ #
+ # Define NO_DEFLATE_BOUND if deflateBound is missing from zlib.
++
++GIT_STASH_FLAGS($ZLIB_PATH)
++
+ AC_DEFUN([ZLIBTEST_SRC], [
+ #include <zlib.h>
+
+@@ -387,7 +417,11 @@ AC_LINK_IFELSE(ZLIBTEST_SRC,
+ [AC_MSG_RESULT([no])
+ NO_DEFLATE_BOUND=yes])
+ LIBS="$old_LIBS"
++
++GIT_UNSTASH_FLAGS($ZLIB_PATH)
++
+ AC_SUBST(NO_DEFLATE_BOUND)
++
+ #
+ # Define NEEDS_SOCKET if linking with libc is not enough (SunOS,
+ # Patrick Mauritz).
+--
+1.6.0.5
+
Added: csw/mgar/pkg/git/trunk/files/0005-configure-asciidoc-version-test-cleanup.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0005-configure-asciidoc-version-test-cleanup.patch (rev 0)
+++ csw/mgar/pkg/git/trunk/files/0005-configure-asciidoc-version-test-cleanup.patch 2009-03-12 19:25:06 UTC (rev 3739)
@@ -0,0 +1,30 @@
+From 9cf13a507a47de584600cd5daa5af6a9846a2d7b Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at artsci.utoronto.ca>
+Date: Wed, 11 Mar 2009 17:23:35 +0100
+Subject: [PATCH] configure: asciidoc version test cleanup
+
+Redirect stderr to /dev/null instead of stdout. This discards warnings
+generated by python 2.6 related to the reorganization of functions within
+modules. The warnings were causing the version detection to break.
+
+Signed-off-by: Ben Walton <bwalton at artsci.utoronto.ca>
+---
+ configure.ac | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index fe9d7eb..f4b8e49 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -291,7 +291,7 @@ fi
+ AC_CHECK_PROGS(ASCIIDOC, [asciidoc])
+ if test -n "$ASCIIDOC"; then
+ AC_MSG_CHECKING([for asciidoc version])
+- asciidoc_version=`$ASCIIDOC --version 2>&1`
++ asciidoc_version=`$ASCIIDOC --version 2>/dev/null`
+ case "${asciidoc_version}" in
+ asciidoc' '8*)
+ ASCIIDOC8=YesPlease
+--
+1.6.0.5
+
Added: csw/mgar/pkg/git/trunk/files/0006-configure-make-iconv-tests-aware-of-user-arguments.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0006-configure-make-iconv-tests-aware-of-user-arguments.patch (rev 0)
+++ csw/mgar/pkg/git/trunk/files/0006-configure-make-iconv-tests-aware-of-user-arguments.patch 2009-03-12 19:25:06 UTC (rev 3739)
@@ -0,0 +1,90 @@
+From 983a81ed86532d2563bbeb528f436134a6ab872e Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at artsci.utoronto.ca>
+Date: Wed, 11 Mar 2009 18:32:34 +0100
+Subject: [PATCH] configure: make iconv tests aware of user arguments
+
+--with-iconv is now taken into account when doing the tests for iconv.
+If the user requests alternate handling for libiconv, the -liconv test
+is run before the -lc test.
+
+Signed-off-by: Ben Walton <bwalton at artsci.utoronto.ca>
+---
+ configure.ac | 48 ++++++++++++++++++++++++++++++++++--------------
+ 1 files changed, 34 insertions(+), 14 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f4b8e49..6fe4bfe 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -375,20 +375,35 @@ int main(void)
+ return 0;
+ }
+ ])
+-AC_MSG_CHECKING([for iconv in -lc])
+-AC_LINK_IFELSE(ICONVTEST_SRC,
++
++if test -n "$ICONVDIR"; then
++ lib_order="-liconv -lc"
++else
++ lib_order="-lc -liconv"
++fi
++
++NO_ICONV=YesPlease
++
++for l in $lib_order; do
++ if test "$l" = "-liconv"; then
++ NEEDS_LIBICONV=YesPlease
++ else
++ NEEDS_LIBICONV=
++ fi
++
++ old_LIBS="$LIBS"
++ LIBS="$LIBS $l"
++ AC_MSG_CHECKING([for iconv in $l])
++ AC_LINK_IFELSE(ICONVTEST_SRC,
+ [AC_MSG_RESULT([yes])
+- NEEDS_LIBICONV=],
+- [AC_MSG_RESULT([no])
+- old_LIBS="$LIBS"
+- LIBS="$LIBS -liconv"
+- AC_MSG_CHECKING([for iconv in -liconv])
+- AC_LINK_IFELSE(ICONVTEST_SRC,
+- [AC_MSG_RESULT([yes])
+- NEEDS_LIBICONV=YesPlease],
+- [AC_MSG_RESULT([no])
+- NO_ICONV=YesPlease])
+- LIBS="$old_LIBS"])
++ NO_ICONV=
++ break],
++ [AC_MSG_RESULT([no])])
++ LIBS="$old_LIBS"
++done
++
++#in case of break
++LIBS="$old_LIBS"
+
+ GIT_UNSTASH_FLAGS($ICONVDIR)
+
+@@ -455,13 +470,18 @@ int main(void)
+ return 0;
+ }
+ ]])
++
++GIT_STASH_FLAGS($ICONVDIR)
++
+ AC_MSG_CHECKING([for old iconv()])
+ AC_COMPILE_IFELSE(OLDICONVTEST_SRC,
+ [AC_MSG_RESULT([no])],
+ [AC_MSG_RESULT([yes])
+ OLD_ICONV=UnfortunatelyYes])
+-AC_SUBST(OLD_ICONV)
+
++GIT_UNSTASH_FLAGS($ICONVDIR)
++
++AC_SUBST(OLD_ICONV)
+
+ ## Checks for typedefs, structures, and compiler characteristics.
+ AC_MSG_NOTICE([CHECKS for typedefs, structures, and compiler characteristics])
+--
+1.6.0.5
+
Added: csw/mgar/pkg/git/trunk/files/0007-configure-rework-pthread-handling-to-allow-for-user.patch
===================================================================
--- csw/mgar/pkg/git/trunk/files/0007-configure-rework-pthread-handling-to-allow-for-user.patch (rev 0)
+++ csw/mgar/pkg/git/trunk/files/0007-configure-rework-pthread-handling-to-allow-for-user.patch 2009-03-12 19:25:06 UTC (rev 3739)
@@ -0,0 +1,129 @@
+From 50df9056b97dc9d6e972e10f6948f0d6761b43b3 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at artsci.utoronto.ca>
+Date: Thu, 12 Mar 2009 19:45:02 +0100
+Subject: [PATCH] configure: rework pthread handling to allow for user defined flags
+
+The tests for POSIX threads can now be controlled by the user with the
+--enable-pthreads=FLAGS option. If this is set (to some value other
+than yes or no), the value is passed to the compiler. Thread support
+is based solely on the outcome of this test. The user may specify not
+to use threading at all or to use the default tests (first -pthread
+then -lpthread) by not specifying FLAGS when passing --enable-pthreads.
+
+Signed-off-by: Ben Walton <bwalton at artsci.utoronto.ca>
+---
+ configure.ac | 89 ++++++++++++++++++++++++++++++++++++++++++++++++----------
+ 1 files changed, 74 insertions(+), 15 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6fe4bfe..4e728bc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -127,6 +127,27 @@ if test -z "$lib"; then
+ lib=lib
+ fi
+
++AC_ARG_ENABLE([pthreads],
++ [AS_HELP_STRING([--enable-pthreads=FLAGS],
++ [FLAGS is the value to pass to the compiler to enable POSIX Threads.]
++ [The default if FLAGS is not specified is to try first -pthread]
++ [and then -lpthread.]
++ [--without-pthreads will disable threading.])],
++[
++if test "x$enableval" = "xyes"; then
++ AC_MSG_NOTICE([Will try -pthread then -lpthread to enable POSIX Threads])
++elif test "x$enableval" != "xno"; then
++ PTHREAD_CFLAGS=$enableval
++ AC_MSG_NOTICE([Setting '$PTHREAD_CFLAGS' as the FLAGS to enable POSIX Threads])
++else
++ AC_MSG_NOTICE([POSIX Threads will be disabled.])
++ NO_PTHREADS=YesPlease
++ USER_NOPTHREAD=1
++fi],
++[
++ AC_MSG_NOTICE([Will try -pthread then -lpthread to enable POSIX Threads.])
++])
++
+ ## Site configuration (override autodetection)
+ ## --with-PACKAGE[=ARG] and --without-PACKAGE
+ AC_MSG_NOTICE([CHECKS for site configuration])
+@@ -672,23 +693,61 @@ AC_SUBST(NO_MKDTEMP)
+ #
+ # Define PTHREAD_LIBS to the linker flag used for Pthread support and define
+ # THREADED_DELTA_SEARCH if Pthreads are available.
+-AC_LANG_CONFTEST([AC_LANG_PROGRAM(
+- [[#include <pthread.h>]],
+- [[pthread_mutex_t test_mutex;]]
+-)])
+-${CC} -pthread conftest.c -o conftest.o > /dev/null 2>&1
+-if test $? -eq 0;then
+- PTHREAD_LIBS="-pthread"
+- THREADED_DELTA_SEARCH=YesPlease
++AC_DEFUN([PTHREADTEST_SRC], [
++#include <pthread.h>
++
++int main(void)
++{
++ pthread_mutex_t test_mutex;
++ return (0);
++}
++])
++
++dnl AC_LANG_CONFTEST([AC_LANG_PROGRAM(
++dnl [[#include <pthread.h>]],
++dnl [[pthread_mutex_t test_mutex;]]
++dnl )])
++
++NO_PTHREADS=UnfortunatelyYes
++THREADED_DELTA_SEARCH=
++PTHREAD_LIBS=
++
++if test -n "$USER_NOPTHREAD"; then
++ AC_MSG_NOTICE([Skipping POSIX Threads at user request.])
++# handle these separately since PTHREAD_CFLAGS could be '-lpthreads
++# -D_REENTRANT' or some such.
++elif test -z "$PTHREAD_CFLAGS"; then
++ for opt in -pthread -lpthread; do
++ old_CFLAGS="$CFLAGS"
++ CFLAGS="$opt $CFLAGS"
++ AC_MSG_CHECKING([Checking for POSIX Threads with '$opt'])
++ AC_LINK_IFELSE(PTHREADTEST_SRC,
++ [AC_MSG_RESULT([yes])
++ NO_PTHREADS=
++ PTHREAD_LIBS="$opt"
++ THREADED_DELTA_SEARCH=YesPlease
++ break
++ ],
++ [AC_MSG_RESULT([no])])
++ CFLAGS="$old_CFLAGS"
++ done
+ else
+- ${CC} -lpthread conftest.c -o conftest.o > /dev/null 2>&1
+- if test $? -eq 0;then
+- PTHREAD_LIBS="-lpthread"
+- THREADED_DELTA_SEARCH=YesPlease
+- else
+- NO_PTHREADS=UnfortunatelyYes
+- fi
++ old_CFLAGS="$CFLAGS"
++ CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
++ AC_MSG_CHECKING([Checking for POSIX Threads with '$PTHREAD_CFLAGS'])
++ AC_LINK_IFELSE(PTHREADTEST_SRC,
++ [AC_MSG_RESULT([yes])
++ NO_PTHREADS=
++ PTHREAD_LIBS="$PTHREAD_CFLAGS"
++ THREADED_DELTA_SEARCH=YesPlease
++ ],
++ [AC_MSG_RESULT([no])])
++
++ CFLAGS="$old_CFLAGS"
+ fi
++
++CFLAGS="$old_CFLAGS"
++
+ AC_SUBST(PTHREAD_LIBS)
+ AC_SUBST(NO_PTHREADS)
+ AC_SUBST(THREADED_DELTA_SEARCH)
+--
+1.6.0.5
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list