* [gentoo-commits] gentoo commit in src/patchsets/STLport/5.2.1/patches: 01_all_5.2.1-opts.diff 04_all_5.2.1-debian-hppa.diff 05_all_5.2.1-debian-fix-warnings.diff 06_all_5.2.1-debian-destdir.diff 08_all_5.2.1-debian-alpha-build.diff 09_all_5.2.1-debian-arm-build-7820fe.diff 10_all_5.2.1-debian-less-warnings-485555.diff 11_all_5.2.1-quote_cxx_version.diff 12_all_5.2.1-overwrite_all_libdir.diff
@ 2010-08-21 9:54 Tiziano Mueller (dev-zero)
0 siblings, 0 replies; only message in thread
From: Tiziano Mueller (dev-zero) @ 2010-08-21 9:54 UTC (permalink / raw
To: gentoo-commits
dev-zero 10/08/21 09:54:44
Added: 01_all_5.2.1-opts.diff
04_all_5.2.1-debian-hppa.diff
05_all_5.2.1-debian-fix-warnings.diff
06_all_5.2.1-debian-destdir.diff
08_all_5.2.1-debian-alpha-build.diff
09_all_5.2.1-debian-arm-build-7820fe.diff
10_all_5.2.1-debian-less-warnings-485555.diff
11_all_5.2.1-quote_cxx_version.diff
12_all_5.2.1-overwrite_all_libdir.diff
Log:
Added patchset for STLport-5.2.1
Revision Changes Path
1.1 src/patchsets/STLport/5.2.1/patches/01_all_5.2.1-opts.diff
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/STLport/5.2.1/patches/01_all_5.2.1-opts.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/STLport/5.2.1/patches/01_all_5.2.1-opts.diff?rev=1.1&content-type=text/plain
Index: 01_all_5.2.1-opts.diff
===================================================================
Index: stlport5.2-5.2.1/build/Makefiles/gmake/gcc.mak
===================================================================
--- stlport5.2-5.2.1.orig/build/Makefiles/gmake/gcc.mak 2008-12-10 10:56:51.000000000 +0100
+++ stlport5.2-5.2.1/build/Makefiles/gmake/gcc.mak 2009-01-11 12:03:07.000000000 +0100
@@ -246,7 +246,7 @@
# optimization and debug compiler flags
release-static : OPT += -O2
-release-shared : OPT += -O2
+release-shared : OPT +=
dbg-static : OPT += -g
dbg-shared : OPT += -g
1.1 src/patchsets/STLport/5.2.1/patches/04_all_5.2.1-debian-hppa.diff
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/STLport/5.2.1/patches/04_all_5.2.1-debian-hppa.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/STLport/5.2.1/patches/04_all_5.2.1-debian-hppa.diff?rev=1.1&content-type=text/plain
Index: 04_all_5.2.1-debian-hppa.diff
===================================================================
Index: stlport5.2-5.2.1/build/Makefiles/gmake/lib/gcc.mak
===================================================================
--- stlport5.2-5.2.1.orig/build/Makefiles/gmake/lib/gcc.mak 2009-01-11 12:17:25.000000000 +0100
+++ stlport5.2-5.2.1/build/Makefiles/gmake/lib/gcc.mak 2009-01-11 12:23:04.000000000 +0100
@@ -158,6 +158,9 @@
END_OBJ := $(shell for o in crtendS.o crtn.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done)
STDLIBS = -Wl,--whole-archive -lsupc++ ${_LGCC_EH} -Wl,--no-whole-archive ${_LGCC_S} -lpthread -lc -lm
endif
+ifneq (,$(findstring $(M_ARCH),hppa parisc64 parisc))
+STDLIBS += -lgcc
+endif
ifeq ($(OSNAME),openbsd)
START_OBJ := $(shell for o in crtbeginS.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done)
END_OBJ := $(shell for o in crtendS.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done)
Index: stlport5.2-5.2.1/build/Makefiles/gmake/app/gcc.mak
===================================================================
--- stlport5.2-5.2.1.orig/build/Makefiles/gmake/app/gcc.mak 2009-01-11 12:17:25.000000000 +0100
+++ stlport5.2-5.2.1/build/Makefiles/gmake/app/gcc.mak 2009-01-11 12:21:04.000000000 +0100
@@ -140,6 +140,9 @@
START_OBJ := $(shell for o in crt1.o crti.o crtbegin.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done)
END_OBJ := $(shell for o in crtend.o crtn.o; do ${CXX} ${CXXFLAGS} -print-file-name=$$o; done)
STDLIBS = ${STLPORT_LIB} ${_LGCC_S} -lpthread -lc -lm
+ifneq (,$(findstring $(M_ARCH),hppa parisc64 parisc))
+STDLIBS += -lgcc
+endif
endif
ifeq ($(OSNAME),openbsd)
1.1 src/patchsets/STLport/5.2.1/patches/05_all_5.2.1-debian-fix-warnings.diff
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/STLport/5.2.1/patches/05_all_5.2.1-debian-fix-warnings.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/STLport/5.2.1/patches/05_all_5.2.1-debian-fix-warnings.diff?rev=1.1&content-type=text/plain
Index: 05_all_5.2.1-debian-fix-warnings.diff
===================================================================
Do we still need this patch? 2009-01-11, Torsten Werner
Index: stlport5.2-5.2.1/stlport/stl/debug/_debug.h
===================================================================
--- stlport5.2-5.2.1.orig/stlport/stl/debug/_debug.h 2008-12-10 10:56:51.000000000 +0100
+++ stlport5.2-5.2.1/stlport/stl/debug/_debug.h 2009-01-11 12:25:26.000000000 +0100
@@ -176,6 +176,7 @@
}
# endif
+# define _STLP_VERBOSE_PARAM(param) param
# define _STLP_DEBUG_CHECK(expr) _STLP_ASSERT(expr)
# if (_STLP_DEBUG_LEVEL == _STLP_STANDARD_DBG_LEVEL)
1.1 src/patchsets/STLport/5.2.1/patches/06_all_5.2.1-debian-destdir.diff
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/STLport/5.2.1/patches/06_all_5.2.1-debian-destdir.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/STLport/5.2.1/patches/06_all_5.2.1-debian-destdir.diff?rev=1.1&content-type=text/plain
Index: 06_all_5.2.1-debian-destdir.diff
===================================================================
- fix INSTALL_HDR_DIR
- do not repeat DESTDIR in BASE_INSTALL_DIR
Index: stlport5.2-5.2.1/build/Makefiles/gmake/targetdirs.mak
===================================================================
--- stlport5.2-5.2.1.orig/build/Makefiles/gmake/targetdirs.mak 2008-12-10 10:56:51.000000000 +0100
+++ stlport5.2-5.2.1/build/Makefiles/gmake/targetdirs.mak 2009-01-11 13:10:32.000000000 +0100
@@ -52,7 +52,7 @@
ifndef WITHOUT_STLPORT
INSTALL_BIN_DIR_STLDBG ?= ${INSTALL_BIN_DIR}_stlg
endif
-INSTALL_HDR_DIR ?= ${BASE_INSTALL_DIR}/include
+INSTALL_HDR_DIR ?= ${BASE_INSTALL_HDR_DIR}/include
ifndef WITHOUT_STLPORT
OUTPUT_DIRS := $(OUTPUT_DIR) $(OUTPUT_DIR_DBG) $(OUTPUT_DIR_STLDBG) \
Index: stlport5.2-5.2.1/configure
===================================================================
--- stlport5.2-5.2.1.orig/configure 2009-01-11 13:10:36.000000000 +0100
+++ stlport5.2-5.2.1/configure 2009-01-11 13:10:43.000000000 +0100
@@ -247,7 +247,7 @@
compiler_family_set=y
;;
--prefix=*)
- write_option "$option" BASE_INSTALL_DIR '${DESTDIR}'
+ write_option "$option" BASE_INSTALL_DIR
prefix_set=y
;;
--bindir=*)
1.1 src/patchsets/STLport/5.2.1/patches/08_all_5.2.1-debian-alpha-build.diff
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/STLport/5.2.1/patches/08_all_5.2.1-debian-alpha-build.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/STLport/5.2.1/patches/08_all_5.2.1-debian-alpha-build.diff?rev=1.1&content-type=text/plain
Index: 08_all_5.2.1-debian-alpha-build.diff
===================================================================
Index: stlport5.2-5.2.1/stlport/stl/_cwchar.h
===================================================================
--- stlport5.2-5.2.1.orig/stlport/stl/_cwchar.h 2009-06-28 15:23:52.000000000 +0200
+++ stlport5.2-5.2.1/stlport/stl/_cwchar.h 2009-06-28 15:24:12.000000000 +0200
@@ -131,22 +131,6 @@
# undef WCHAR_MAX
# define WCHAR_MAX 0xffff
# endif
-# if defined (__GNUC__) && defined (__alpha__)
-/* Definition of WCHAR_MIN and MAX are wrong for alpha platform
- * as gcc consider wchar_t as an unsigned type but WCHAR_MIN is defined as
- * a negative value. Static assertion is here to check that a future alpha
- * SDK or a future gcc won't change the situation making this workaround
- * useless.
- */
-/* Check that gcc still consider wchar_t as unsigned */
-_STLP_STATIC_ASSERT(((wchar_t)-1 > 0))
-/* Check that WCHAR_MIN value hasn't been fixed */
-_STLP_STATIC_ASSERT((WCHAR_MIN < 0))
-# undef WCHAR_MIN
-# define WCHAR_MIN 0
-# undef WCHAR_MAX
-# define WCHAR_MAX 0xffffffff
-# endif
# if defined(__HP_aCC) && (__HP_aCC >= 60000)
/* Starting with B.11.31, HP-UX/ia64 provides C99-compliant definitions
* of WCHAR_MIN/MAX macros without having to define
1.1 src/patchsets/STLport/5.2.1/patches/09_all_5.2.1-debian-arm-build-7820fe.diff
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/STLport/5.2.1/patches/09_all_5.2.1-debian-arm-build-7820fe.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/STLport/5.2.1/patches/09_all_5.2.1-debian-arm-build-7820fe.diff?rev=1.1&content-type=text/plain
Index: 09_all_5.2.1-debian-arm-build-7820fe.diff
===================================================================
From: Petr Ovtchenkov <ptr@void-ptr.info>
Date: Thu, 25 Jun 2009 08:06:11 +0000 (+0400)
Subject: Fix build for ARM GNU/Linux
X-Git-Url: http://stlport.git.sourceforge.net/git/gitweb.cgi?p=stlport;a=commitdiff_plain;h=7820fe8e502b062f82d8bb630ad07aa20f6d2d4c
Fix build for ARM GNU/Linux
llabs, lldiv_t, lldiv not defined in native gcc's std namespace;
use ones from C space (i.e. from global namespace) instead.
Build done for Sourcery G++ Lite 2009q1-176 for ARM GNU/Linux;
unit test build success, run not checked.
---
Index: stlport5.2-5.2.1/stlport/stl/_cstdlib.h
===================================================================
--- stlport5.2-5.2.1.orig/stlport/stl/_cstdlib.h 2008-12-10 10:56:51.000000000 +0100
+++ stlport5.2-5.2.1/stlport/stl/_cstdlib.h 2009-06-28 15:22:50.000000000 +0200
@@ -91,7 +91,7 @@
using _STLP_VENDOR_CSTD::labs;
using _STLP_VENDOR_CSTD::ldiv;
# if defined (_STLP_LONG_LONG) && !defined (_STLP_NO_VENDOR_STDLIB_L)
-# if !defined(__sun)
+# if !defined(__sun) && !defined(__arm__)
using _STLP_VENDOR_CSTD::llabs;
using _STLP_VENDOR_CSTD::lldiv_t;
using _STLP_VENDOR_CSTD::lldiv;
@@ -147,7 +147,7 @@
#if defined (_STLP_LONG_LONG)
# if !defined (_STLP_NO_VENDOR_STDLIB_L)
-# if !defined (__sun)
+# if !defined (__sun) && !defined(__arm__) && !defined(__mips__) && !defined(__mipsel__)
inline _STLP_LONG_LONG abs(_STLP_LONG_LONG __x) { return _STLP_VENDOR_CSTD::llabs(__x); }
inline lldiv_t div(_STLP_LONG_LONG __x, _STLP_LONG_LONG __y) { return _STLP_VENDOR_CSTD::lldiv(__x, __y); }
# else
1.1 src/patchsets/STLport/5.2.1/patches/10_all_5.2.1-debian-less-warnings-485555.diff
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/STLport/5.2.1/patches/10_all_5.2.1-debian-less-warnings-485555.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/STLport/5.2.1/patches/10_all_5.2.1-debian-less-warnings-485555.diff?rev=1.1&content-type=text/plain
Index: 10_all_5.2.1-debian-less-warnings-485555.diff
===================================================================
Index: stlport5.2-5.2.1/stlport/stl/_algobase.c
===================================================================
--- stlport5.2-5.2.1.orig/stlport/stl/_algobase.c 2008-12-10 10:56:51.000000000 +0100
+++ stlport5.2-5.2.1/stlport/stl/_algobase.c 2009-06-29 19:30:21.000000000 +0200
@@ -326,7 +326,7 @@
template <class _InputIter, class _ForwardIter, class _Tp1, class _Tp2>
inline _InputIter __find_first_of_aux1(_InputIter __first1, _InputIter __last1,
_ForwardIter __first2, _ForwardIter __last2,
- _Tp1* __pt1, _Tp2* __pt2) {
+ _Tp1*, _Tp2* __pt2) {
typedef _STLP_TYPENAME _STLP_STD::_IsIntegral<_Tp1>::_Ret _IsIntegral;
typedef _STLP_TYPENAME _STLP_PRIV _IsCharLikeType<_Tp2>::_Ret _IsCharLike;
typedef _STLP_TYPENAME _STLP_STD::_Land2<_IsIntegral, _IsCharLike>::_Ret _UseStrcspnLikeAlgo;
@@ -451,7 +451,7 @@
template <class _ForwardIter, class _Tp, class _Compare1, class _Compare2, class _Distance>
_ForwardIter __lower_bound(_ForwardIter __first, _ForwardIter __last, const _Tp& __val,
- _Compare1 __comp1, _Compare2 __comp2, _Distance*) {
+ _Compare1 __comp1, _Compare2 _STLP_VERBOSE_PARAM(__comp2), _Distance*) {
_Distance __len = _STLP_STD::distance(__first, __last);
_Distance __half;
_ForwardIter __middle;
Index: stlport5.2-5.2.1/stlport/stl/_hashtable.c
===================================================================
--- stlport5.2-5.2.1.orig/stlport/stl/_hashtable.c 2008-12-10 10:56:51.000000000 +0100
+++ stlport5.2-5.2.1/stlport/stl/_hashtable.c 2009-06-29 19:30:21.000000000 +0200
@@ -166,12 +166,12 @@
typename _BucketVector::const_iterator __bcur(__bpos);
_BucketType *__pos_node = __pos._M_node;
- for (--__bcur; __pos_node == *__bcur; --__bcur);
+ for (--__bcur; __pos_node == *__bcur; --__bcur) ;
__n = __bcur - __buckets.begin() + 1;
_ElemsIte __cur(*__bcur);
_ElemsIte __prev = __cur++;
- for (; __cur != __pos; ++__prev, ++__cur);
+ for (; __cur != __pos; ++__prev, ++__cur) ;
return __prev;
}
@@ -345,7 +345,7 @@
else {
_ElemsIte __last(_M_buckets[++__f_bucket]);
__prev = __cur++;
- for (; (__cur != __last) && (__cur != __first._M_ite); ++__prev, ++__cur);
+ for (; (__cur != __last) && (__cur != __first._M_ite); ++__prev, ++__cur) ;
}
size_type __erased = 0;
//We do not use the slist::erase_after method taking a range to count the
@@ -464,7 +464,7 @@
_ElemsIte __ite(__cur), __before_ite(__cur);
for (++__ite;
__ite != __last && _M_equals(_M_get_key(*__cur), _M_get_key(*__ite));
- ++__ite, ++__before_ite);
+ ++__ite, ++__before_ite) ;
size_type __prev_bucket = __new_bucket;
_ElemsIte __prev = _S_before_begin(__tmp_elems, __tmp, __prev_bucket)._M_ite;
__tmp_elems.splice_after(__prev, _M_elems, _M_elems.before_begin(), __before_ite);
Index: stlport5.2-5.2.1/stlport/stl/_hashtable.h
===================================================================
--- stlport5.2-5.2.1.orig/stlport/stl/_hashtable.h 2008-12-10 10:56:51.000000000 +0100
+++ stlport5.2-5.2.1/stlport/stl/_hashtable.h 2009-06-29 19:30:21.000000000 +0200
@@ -499,7 +499,7 @@
size_type __n = _M_bkt_num_key(__key);
_ElemsIte __first(_M_buckets[__n]);
_ElemsIte __last(_M_buckets[__n + 1]);
- for ( ; (__first != __last) && !_M_equals(_M_get_key(*__first), __key); ++__first);
+ for ( ; (__first != __last) && !_M_equals(_M_get_key(*__first), __key); ++__first) ;
if (__first != __last)
return __first;
else
@@ -523,7 +523,7 @@
size_type __result = 1;
for (++__cur;
__cur != __last && _M_equals(_M_get_key(*__cur), __key);
- ++__result, ++__cur);
+ ++__result, ++__cur) ;
return __result;
}
}
@@ -539,7 +539,7 @@
__first != __last; ++__first) {
if (_M_equals(_M_get_key(*__first), __key)) {
_ElemsIte __cur(__first);
- for (++__cur; (__cur != __last) && _M_equals(_M_get_key(*__cur), __key); ++__cur);
+ for (++__cur; (__cur != __last) && _M_equals(_M_get_key(*__cur), __key); ++__cur) ;
return _Pii(__first, __cur);
}
}
@@ -555,7 +555,7 @@
__first != __last; ++__first) {
if (_M_equals(_M_get_key(*__first), __key)) {
_ElemsIte __cur(__first);
- for (++__cur; (__cur != __last) && _M_equals(_M_get_key(*__cur), __key); ++__cur);
+ for (++__cur; (__cur != __last) && _M_equals(_M_get_key(*__cur), __key); ++__cur) ;
return _Pii(__first, __cur);
}
}
Index: stlport5.2-5.2.1/stlport/stl/_list.c
===================================================================
--- stlport5.2-5.2.1.orig/stlport/stl/_list.c 2008-12-10 10:56:51.000000000 +0100
+++ stlport5.2-5.2.1/stlport/stl/_list.c 2009-06-29 19:30:21.000000000 +0200
@@ -95,7 +95,7 @@
void list<_Tp, _Alloc>::resize(size_type __new_size, const _Tp& __x) {
iterator __i = begin();
size_type __len = 0;
- for ( ; __i != end() && __len < __new_size; ++__i, ++__len);
+ for ( ; __i != end() && __len < __new_size; ++__i, ++__len) ;
if (__len == __new_size)
erase(__i, end());
Index: stlport5.2-5.2.1/stlport/stl/_string.c
===================================================================
--- stlport5.2-5.2.1.orig/stlport/stl/_string.c 2008-12-10 10:56:51.000000000 +0100
+++ stlport5.2-5.2.1/stlport/stl/_string.c 2009-06-29 19:30:21.000000000 +0200
@@ -110,7 +110,7 @@
template <class _InputIter, class _CharT, class _Tp, class _Traits>
inline _InputIter __str_find_first_not_of_aux2(_InputIter __first1, _InputIter __last1,
const _CharT* __first2, const _CharT* __last2,
- _Tp* __pt, _Traits* __traits) {
+ _Tp*, _Traits* __traits) {
typedef typename _IsIntegral<_Tp>::_Ret _IsIntegral;
typedef typename _IsCharLikeType<_CharT>::_Ret _IsCharLike;
typedef typename _Land2<_IsIntegral, _IsCharLike>::_Ret _UseStrcspnLikeAlgo;
Index: stlport5.2-5.2.1/stlport/stl/_string_base.h
===================================================================
--- stlport5.2-5.2.1.orig/stlport/stl/_string_base.h 2008-12-10 10:56:51.000000000 +0100
+++ stlport5.2-5.2.1/stlport/stl/_string_base.h 2009-06-29 19:30:21.000000000 +0200
@@ -69,7 +69,7 @@
_Tp* _M_End()
{ return _M_using_static_buf() ? _M_buffers._M_static_buf + _DEFAULT_SIZE : _M_buffers._M_end_of_storage; }
size_type _M_capacity() const
- { return _M_using_static_buf() ? _DEFAULT_SIZE : _M_buffers._M_end_of_storage - _M_start_of_storage._M_data; }
+ { return _M_using_static_buf() ? _DEFAULT_SIZE + 0 : _M_buffers._M_end_of_storage - _M_start_of_storage._M_data; }
size_type _M_rest() const
{ return _M_using_static_buf() ? _DEFAULT_SIZE - (_M_finish - _M_buffers._M_static_buf) : _M_buffers._M_end_of_storage - _M_finish; }
#else
Index: stlport5.2-5.2.1/stlport/stl/debug/_debug.h
===================================================================
--- stlport5.2-5.2.1.orig/stlport/stl/debug/_debug.h 2009-06-29 19:29:13.000000000 +0200
+++ stlport5.2-5.2.1/stlport/stl/debug/_debug.h 2009-06-29 19:30:21.000000000 +0200
@@ -438,6 +438,7 @@
#else
# define _STLP_VERBOSE_ASSERT(expr, diagnostic)
+# define _STLP_VERBOSE_PARAM(param)
# define _STLP_DEBUG_CHECK(expr)
#endif /* _STLP_DEBUG */
1.1 src/patchsets/STLport/5.2.1/patches/11_all_5.2.1-quote_cxx_version.diff
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/STLport/5.2.1/patches/11_all_5.2.1-quote_cxx_version.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/STLport/5.2.1/patches/11_all_5.2.1-quote_cxx_version.diff?rev=1.1&content-type=text/plain
Index: 11_all_5.2.1-quote_cxx_version.diff
===================================================================
diff --git a/build/Makefiles/gmake/CC.mak b/build/Makefiles/gmake/CC.mak
index 8383bb1..6e0e56b 100644
--- a/build/Makefiles/gmake/CC.mak
+++ b/build/Makefiles/gmake/CC.mak
@@ -25,9 +25,9 @@ endif
CXX_VERSION := $(shell ${CXX} -V 2>&1 | grep ${CXX} | awk '{ print $$4; }')
-CXX_VERSION_MAJOR := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$1; }')
-CXX_VERSION_MINOR := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$2; }')
-CXX_VERSION_PATCH := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { if (NF > 2) {print $$3;}else{print "0"} }')
+CXX_VERSION_MAJOR := $(shell echo "${CXX_VERSION}" | awk 'BEGIN { FS = "."; } { print $$1; }')
+CXX_VERSION_MINOR := $(shell echo "${CXX_VERSION}" | awk 'BEGIN { FS = "."; } { print $$2; }')
+CXX_VERSION_PATCH := $(shell echo "${CXX_VERSION}" | awk 'BEGIN { FS = "."; } { if (NF > 2) {print $$3;}else{print "0"} }')
DEFS ?=
OPT ?=
diff --git a/build/Makefiles/gmake/aCC.mak b/build/Makefiles/gmake/aCC.mak
index 1ecbd14..c8853dd 100644
--- a/build/Makefiles/gmake/aCC.mak
+++ b/build/Makefiles/gmake/aCC.mak
@@ -25,8 +25,8 @@ CXX_VERSION := $(shell ${CXX} --version 2>&1 | grep ${CXX} | awk '{ print $$6; }
ifeq ($(CXX_VERSION),)
CXX_VERSION := $(shell ${CXX} --version)
endif
-CXX_VERSION_MAJOR := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$2; }')
-CXX_VERSION_MINOR := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$3; }')
+CXX_VERSION_MAJOR := $(shell echo "${CXX_VERSION}" | awk 'BEGIN { FS = "."; } { print $$2; }')
+CXX_VERSION_MINOR := $(shell echo "${CXX_VERSION}" | awk 'BEGIN { FS = "."; } { print $$3; }')
DEFS ?=
OPT ?=
diff --git a/build/Makefiles/gmake/gcc.mak b/build/Makefiles/gmake/gcc.mak
index 16ec435..8afa377 100644
--- a/build/Makefiles/gmake/gcc.mak
+++ b/build/Makefiles/gmake/gcc.mak
@@ -32,9 +32,9 @@ AS := ${TARGET_OS}-${AS}
endif
CXX_VERSION := $(shell ${CXX} -dumpversion)
-CXX_VERSION_MAJOR := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$1; }')
-CXX_VERSION_MINOR := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$2; }')
-CXX_VERSION_PATCH := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$3; }')
+CXX_VERSION_MAJOR := $(shell echo "${CXX_VERSION}" | awk 'BEGIN { FS = "."; } { print $$1; }')
+CXX_VERSION_MINOR := $(shell echo "${CXX_VERSION}" | awk 'BEGIN { FS = "."; } { print $$2; }')
+CXX_VERSION_PATCH := $(shell echo "${CXX_VERSION}" | awk 'BEGIN { FS = "."; } { print $$3; }')
# Check that we need option -fuse-cxa-atexit for compiler
_CXA_ATEXIT := $(shell ${CXX} -v 2>&1 | grep -q -e "--enable-__cxa_atexit" || echo "-fuse-cxa-atexit")
diff --git a/build/Makefiles/gmake/icc.mak b/build/Makefiles/gmake/icc.mak
index 8b0c47c..25b6322 100644
--- a/build/Makefiles/gmake/icc.mak
+++ b/build/Makefiles/gmake/icc.mak
@@ -25,9 +25,9 @@ ifeq (${CXX_VERSION},)
CXX_VERSION := $(shell ${CXX} --version)
endif
-CXX_VERSION_MAJOR := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$1; }')
-CXX_VERSION_MINOR := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$2; }')
-# CXX_VERSION_PATCH := $(shell echo ${CXX_VERSION} | awk 'BEGIN { FS = "."; } { print $$3; }')
+CXX_VERSION_MAJOR := $(shell echo "${CXX_VERSION}" | awk 'BEGIN { FS = "."; } { print $$1; }')
+CXX_VERSION_MINOR := $(shell echo "${CXX_VERSION}" | awk 'BEGIN { FS = "."; } { print $$2; }')
+# CXX_VERSION_PATCH := $(shell echo "${CXX_VERSION}" | awk 'BEGIN { FS = "."; } { print $$3; }')
SYSINCLUDES := -I$(shell which icpc | xargs dirname | xargs dirname)/include/c++
1.1 src/patchsets/STLport/5.2.1/patches/12_all_5.2.1-overwrite_all_libdir.diff
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/STLport/5.2.1/patches/12_all_5.2.1-overwrite_all_libdir.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/STLport/5.2.1/patches/12_all_5.2.1-overwrite_all_libdir.diff?rev=1.1&content-type=text/plain
Index: 12_all_5.2.1-overwrite_all_libdir.diff
===================================================================
diff --git a/configure b/configure
index 3f4f286..71f3eca 100755
--- a/configure
+++ b/configure
@@ -255,6 +255,8 @@ do
;;
--libdir=*)
write_option "$option" INSTALL_LIB_DIR '${DESTDIR}'
+ write_option "$option" INSTALL_LIB_DIR_DBG '${DESTDIR}'
+ write_option "$option" INSTALL_LIB_DIR_STLDBG '${DESTDIR}'
;;
--includedir=*)
write_option "$option" INSTALL_HDR_DIR '${DESTDIR}'
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2010-08-21 9:54 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-21 9:54 [gentoo-commits] gentoo commit in src/patchsets/STLport/5.2.1/patches: 01_all_5.2.1-opts.diff 04_all_5.2.1-debian-hppa.diff 05_all_5.2.1-debian-fix-warnings.diff 06_all_5.2.1-debian-destdir.diff 08_all_5.2.1-debian-alpha-build.diff 09_all_5.2.1-debian-arm-build-7820fe.diff 10_all_5.2.1-debian-less-warnings-485555.diff 11_all_5.2.1-quote_cxx_version.diff 12_all_5.2.1-overwrite_all_libdir.diff Tiziano Mueller (dev-zero)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox