OpenPKG Specs / changeset

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/stlport/stlport.patch	Thu Jan 08 01:13:59 2009 +0100
     1.3 @@ -0,0 +1,28 @@
     1.4 +Index: build/Makefiles/gmake/targetdirs.mak
     1.5 +--- build/Makefiles/gmake/targetdirs.mak.orig	2009-01-07 23:43:14.257973250 +0100
     1.6 ++++ build/Makefiles/gmake/targetdirs.mak	2009-01-07 23:43:20.537852206 +0100
     1.7 +@@ -80,10 +80,7 @@
     1.8 + 
     1.9 + define createdirs
    1.10 + @for d in $@ ; do \
    1.11 +-  if [ -e $$d -a -f $$d ] ; then \
    1.12 +-    echo "ERROR: Regular file $$d present, directory instead expected" ; \
    1.13 +-    exit 1; \
    1.14 +-  elif [ ! -d $$d ] ; then \
    1.15 ++  if [ ! -d $$d ] ; then \
    1.16 +     mkdir -p $$d ; \
    1.17 +   fi ; \
    1.18 + done
    1.19 +Index: stlport/stl/config/host.h
    1.20 +--- stlport/stl/config/host.h.orig	2009-01-07 23:44:43.751377659 +0100
    1.21 ++++ stlport/stl/config/host.h	2009-01-07 23:44:20.070524718 +0100
    1.22 +@@ -316,9 +316,7 @@
    1.23 + /*
    1.24 + #define __SunOS_5_9
    1.25 +  */
    1.26 +-/*
    1.27 + #define __SunOS_5_10
    1.28 +- */
    1.29 + #endif
    1.30 + 
    1.31 + #if defined(__sun)

     2.1 --- a/stlport/stlport.spec	Thu Jan 08 01:12:39 2009 +0100
     2.2 +++ b/stlport/stlport.spec	Thu Jan 08 01:13:59 2009 +0100
     2.3 @@ -31,14 +31,15 @@
     2.4  Class:        EVAL
     2.5  Group:        Language
     2.6  License:      STLport
     2.7 -Version:      5.0.2
     2.8 -Release:      20080101
     2.9 +Version:      5.2.1
    2.10 +Release:      20090106
    2.11  
    2.12  #   package options
    2.13  %option       with_debug  yes
    2.14  
    2.15  #   list of sources
    2.16  Source0:      http://switch.dl.sourceforge.net/stlport/STLport-%{version}.tar.gz
    2.17 +Patch0:       stlport.patch
    2.18  
    2.19  #   build information
    2.20  Prefix:       %{l_prefix}
    2.21 @@ -66,12 +67,19 @@
    2.22      }
    2.23  
    2.24  %prep
    2.25 -    %setup -q -n STLport
    2.26 +    %setup -q -n STLport-%{version}
    2.27 +    %patch -p0
    2.28      %{l_shtool} subst \
    2.29 -        -e 's;\(define _STLP_NATIVE_INCLUDE_PATH\).*;\1 %{l_prefix}/include/g++;' \
    2.30 -        stlport/config/stl_gcc.h
    2.31 +        -e 's;^\(#  if defined (__QNXNTO__) || ( defined(__GNUC__)\) && defined(__APPLE__) );\1;' \
    2.32 +        src/num_put_float.cpp
    2.33      %{l_shtool} subst \
    2.34 -        -e 's;^\(# if defined (__QNXNTO__) || ( defined(__GNUC__)\) && defined(__APPLE__);\1;' \
    2.35 +        -e 's/__f->_file;/fileno((FILE *)__f);/g' \
    2.36 +        src/_stdio_file.h
    2.37 +    %{l_shtool} subst \
    2.38 +        -e 's;\(_STLP_STATIC_ASSERT( sizeof(long double).*\);//\1;' \
    2.39 +        src/num_get_float.cpp
    2.40 +    %{l_shtool} subst \
    2.41 +        -e 's;( \(defined(__GNUC__)\);\1;' \
    2.42          src/num_put_float.cpp
    2.43  
    2.44  %build
    2.45 @@ -79,7 +87,7 @@
    2.46  %if "%{with_debug}" == "yes"
    2.47        buildtargets="$buildtargets dbg-static stldbg-static"
    2.48  %endif
    2.49 -    cd build/lib && %{l_make} %{l_mflags} -f gcc.mak $buildtargets
    2.50 +    cd build/lib && %{l_make} %{l_mflags -O} -f gcc.mak $buildtargets
    2.51  
    2.52  %install
    2.53      rm -rf $RPM_BUILD_ROOT