Revision: 18141
http://gar.svn.sourceforge.net/gar/?rev=18141&view=rev
Author: rthurner
Date: 2012-05-28 09:12:40 +0000 (Mon, 28 May 2012)
Log Message:
-----------
cmake, patch bootstrap to accept old style parameters again
Modified Paths:
--------------
csw/mgar/pkg/cmake/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/cmake/trunk/files/0001-bootstrap-Port-back-to-old-shells-13199.patch
Modified: csw/mgar/pkg/cmake/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cmake/trunk/Makefile 2012-05-27 21:50:40 UTC (rev 18140)
+++ csw/mgar/pkg/cmake/trunk/Makefile 2012-05-28 09:12:40 UTC (rev 18141)
@@ -20,6 +20,8 @@
MASTER_SITES = http://cmake.org/files/v$(RELVER)/
DISTFILES = $(NAME)-$(VERSION).tar.gz
LICENSE = Copyright.txt
+# temporary for cmake-2.8.8, see
http://public.kitware.com/Bug/view.php?id=13199
+PATCHFILES += 0001-bootstrap-Port-back-to-old-shells-13199.patch
PACKAGES = CSWcmake
CATALOGNAME_CSWcmake = cmake
@@ -27,12 +29,8 @@
RUNTIME_DEP_PKGS_CSWcmake += CSWlibidn11
-datadir = /share/$(NAME)-$(VERSION)
-sharedstatedir = /share
-docdir = /share/doc/$(NAME)-$(VERSION)
-
NOISALIST = 1
-CONFIGURE_ARGS = $(DIRPATHS) --docdir=$(docdir)
+CONFIGURE_ARGS = --prefix=$(prefix)
TEST_TARGET = test
# Some tests are failing.
@@ -50,23 +48,6 @@
EXTRA_CFLAGS = -xnorunpath
EXTRA_CXXFLAGS = -norunpath
-pre-configure:
- @echo $(DIRPATHS)
- @echo "Docdir: $(docdir)"
- # Do NOT include the CSW include pathes here
- (cd $(WORKSRC); /usr/bin/env \
- CFLAGS="$($(GARCOMPILER)_CC_$(GARFLAVOR)) -I/opt/csw/include" \
- CXXFLAGS="$($(GARCOMPILER)_CXX_$(GARFLAVOR))
-I/opt/csw/include" \
- LDFLAGS="-L/opt/csw/lib -R/opt/csw/lib/$$ISALIST
-R/opt/csw/lib" \
- ./bootstrap \
- --prefix=$(prefix) \
- --datadir=$(datadir) \
- --docdir=$(docdir) \
- --mandir=/man \
- --system-libs \
- )
- @$(MAKECOOKIE)
-
post-configure-modulated:
@(echo "==> Forcing use of system libraries")
@(echo "=====> curl, expat, xmlrpc, and zlib")
Added:
csw/mgar/pkg/cmake/trunk/files/0001-bootstrap-Port-back-to-old-shells-13199.patch
===================================================================
---
csw/mgar/pkg/cmake/trunk/files/0001-bootstrap-Port-back-to-old-shells-13199.patch
(rev 0)
+++
csw/mgar/pkg/cmake/trunk/files/0001-bootstrap-Port-back-to-old-shells-13199.patch
2012-05-28 09:12:40 UTC (rev 18141)
@@ -0,0 +1,69 @@
+From e5dc76894ae8fbc95126ebb54a838e0342686b96 Mon Sep 17 00:00:00 2001
+Message-Id:
<e5dc76894ae8fbc95126ebb54a838e0342686b96.1336485168.git.brad.k...@kitware.com>
+From: Brad King <brad.k...@kitware.com>
+Date: Tue, 8 May 2012 09:43:19 -0400
+Subject: [PATCH] bootstrap: Port back to old shells (#13199)
+
+Since commit f39e82c9 (bootstrap: Re-implement command line option
+processing, 2011-12-16) bootstrap uses POSIX shell expressions of the
+form "${x#y}" to remove prefix pattern 'y' from the vaule of 'x'.
+Although this is allowed by POSIX old shells on some platforms do not
+support it. Revert to using 'sed' to work with old shells.
+---
+ bootstrap | 27 ++++++++++++++++++---------
+ 1 file changed, 18 insertions(+), 9 deletions(-)
+
+diff --git a/bootstrap b/bootstrap
+index 3be3d1f..7b044e7 100755
+--- a/bootstrap
++++ b/bootstrap
+@@ -460,6 +460,12 @@ cmake_escape ()
+ echo $1 | sed "s/ /\\\\ /g"
+ }
+
++# Strip prefix from argument
++cmake_arg ()
++{
++ echo "$1" | sed "s/^${2-[^=]*=}//"
++}
++
+ # Write message to the log
+ cmake_log ()
+ {
+@@ -544,21 +550,24 @@ cmake_ccache_enabled=
+ cmake_prefix_dir="${cmake_default_prefix}"
+ while test $# != 0; do
+ case "$1" in
+- --prefix=*) cmake_prefix_dir=`cmake_fix_slashes "${1#*=}"` ;;
+- --parallel=*) cmake_parallel_make="${1#*=}" ;;
+- --datadir=*) cmake_data_dir="${1#*=}" ;;
+- --docdir=*) cmake_doc_dir="${1#*=}" ;;
+- --mandir=*) cmake_man_dir="${1#*=}" ;;
+- --init=*) cmake_init_file="${1#*=}" ;;
++ --prefix=*) dir=`cmake_arg "$1"`
++ cmake_prefix_dir=`cmake_fix_slashes "$dir"` ;;
++ --parallel=*) cmake_parallel_make=`cmake_arg "$1"` ;;
++ --datadir=*) cmake_data_dir=`cmake_arg "$1"` ;;
++ --docdir=*) cmake_doc_dir=`cmake_arg "$1"` ;;
++ --mandir=*) cmake_man_dir=`cmake_arg "$1"` ;;
++ --init=*) cmake_init_file=`cmake_arg "$1"` ;;
+ --system-libs) cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs}
-DCMAKE_USE_SYSTEM_LIBRARIES=1" ;;
+ --no-system-libs)
cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs}
-DCMAKE_USE_SYSTEM_LIBRARIES=0" ;;
+
--system-bzip2|--system-curl|--system-expat|--system-libarchive|--system-zlib)
+- cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs}
-DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper ${1#--system-}`=1" ;;
++ lib=`cmake_arg "$1" "--system-"`
++ cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs}
-DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper $lib`=1" ;;
+
--no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-libarchive|--no-system-zlib)
+- cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs}
-DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper ${1#--no-system-}`=0" ;;
++ lib=`cmake_arg "$1" "--no-system-"`
++ cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs}
-DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper $lib`=0" ;;
+ --qt-gui) cmake_bootstrap_qt_gui="1" ;;
+ --no-qt-gui) cmake_bootstrap_qt_gui="0" ;;
+- --qt-qmake=*) cmake_bootstrap_qt_qmake="${1#*=}" ;;
++ --qt-qmake=*) cmake_bootstrap_qt_qmake=`cmake_arg "$1"` ;;
+ --help) cmake_usage ;;
+ --version) cmake_version_display ; exit 2 ;;
+ --verbose) cmake_verbose=TRUE ;;
+--
+1.7.10
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
