stlport/stlport.patch@870131689a5c
stlport/stlport.patch
Sat, 21 May 2011 22:05:42 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Sat, 21 May 2011 22:05:42 +0200
- changeset 340
- 870131689a5c
- permissions
- -rw-r--r--
Correct diverse buildconf of upstream release and reconcile packaging somewhat.
These changes stem from the obvious changes in the latest vendor release, but
from discussions with trolls Daniel and Oswald as well regarding build config.
This commital follows conclusion of buildconf adjustments to allow the new
vendor version to build on Linux AMD64, but is incomplete as many packaging
comments show. The next series of changes focus on Solaris IA32 and reduction
of buildconf adjustments testing old problems comprehensively in anticipation
of discussion at the upcoming Nokia Contributor Summit in Berlin.
1 Index: build/Makefiles/gmake/targetdirs.mak
2 --- build/Makefiles/gmake/targetdirs.mak.orig 2009-01-07 23:43:14.257973250 +0100
3 +++ build/Makefiles/gmake/targetdirs.mak 2009-01-07 23:43:20.537852206 +0100
4 @@ -80,10 +80,7 @@
6 define createdirs
7 @for d in $@ ; do \
8 - if [ -e $$d -a -f $$d ] ; then \
9 - echo "ERROR: Regular file $$d present, directory instead expected" ; \
10 - exit 1; \
11 - elif [ ! -d $$d ] ; then \
12 + if [ ! -d $$d ] ; then \
13 mkdir -p $$d ; \
14 fi ; \
15 done
16 Index: stlport/stl/config/host.h
17 --- stlport/stl/config/host.h.orig 2009-01-07 23:44:43.751377659 +0100
18 +++ stlport/stl/config/host.h 2009-01-07 23:44:20.070524718 +0100
19 @@ -316,9 +316,7 @@
20 /*
21 #define __SunOS_5_9
22 */
23 -/*
24 #define __SunOS_5_10
25 - */
26 #endif
28 #if defined(__sun)
