OpenPKG Specs / changeset

     1.1 --- a/gcc/gcc.patch	Sun Mar 18 18:45:29 2012 +0100
     1.2 +++ b/gcc/gcc.patch	Thu Mar 22 20:51:00 2012 +0100
     1.3 @@ -64,7 +64,7 @@
     1.4  diff -Nau gcc/config/sol2.h.orig gcc/config/sol2.h
     1.5  --- gcc/config/sol2.h.orig	2011-01-26 21:23:17.000000000 +0100
     1.6  +++ gcc/config/sol2.h	2011-03-27 18:06:45.477952967 +0200
     1.7 -@@ -183,8 +183,8 @@
     1.8 +@@ -181,8 +181,8 @@
     1.9     "%{h*} %{v:-V} \
    1.10      %{!shared:%{!static:%{rdynamic: " RDYNAMIC_SPEC "}}} \
    1.11      %{static:-dn -Bstatic} \
    1.12 @@ -72,9 +72,9 @@
    1.13  -   %{symbolic:-Bsymbolic -G -dy -z text} \
    1.14  +   %{shared:-G -dy} \
    1.15  +   %{symbolic:-Bsymbolic -G -dy} \
    1.16 +    %{pthreads|pthread|threads:" LIB_THREAD_LDFLAGS_SPEC "} \
    1.17      %(link_arch) \
    1.18      %{Qy:} %{!Qn:-Qy}"
    1.19 - 
    1.20  Index: gcc/system.h
    1.21  diff -Nau gcc/system.h.orig gcc/system.h
    1.22  --- gcc/system.h.orig	2011-01-09 13:41:33.000000000 +0100

     2.1 --- a/gcc/gcc.spec	Sun Mar 18 18:45:29 2012 +0100
     2.2 +++ b/gcc/gcc.spec	Thu Mar 22 20:51:00 2012 +0100
     2.3 @@ -22,7 +22,7 @@
     2.4  ##
     2.5  
     2.6  #   package version
     2.7 -%define       V_full         4.6.0
     2.8 +%define       V_full         4.6.2
     2.9  %define       V_comp         %nil
    2.10  
    2.11  #   package information
    2.12 @@ -36,7 +36,7 @@
    2.13  Group:        Compiler
    2.14  License:      GPL
    2.15  Version:      %{V_full}
    2.16 -Release:      20110400
    2.17 +Release:      20120208
    2.18  
    2.19  #   package options
    2.20  %option       with_binutils  yes
    2.21 @@ -144,7 +144,6 @@
    2.22          libjava/configure
    2.23      %{l_shtool} subst \
    2.24          -e 's;JAR *= *@JAR@;JAR = $(here)/scripts/jar;' \
    2.25 -        -e 's;\(jardir *= *\$(datadir)\)/java;\1/gcc/java;' \
    2.26          libjava/Makefile.in
    2.27  %endif
    2.28      if [ ".%{V_comp}" != . ]; then
    2.29 @@ -171,6 +170,26 @@
    2.30          -e 's;.*with_arch_32=\${with_arch_32:-pentium4}.*;;' \
    2.31          -e 's;with_arch_32=\${with_arch_32:-pentiumpro};arch_without_sse2=yes;' \
    2.32          gcc/config.gcc
    2.33 +        #-e 's;\(with_arch_32=\${with_arch_32:-\)pentium4};\1pentium3};' \
    2.34 +
    2.35 +%if "%{with_cxx}" == "yes"
    2.36 +    #   sad hack to correct split gettext in libc and libintl each
    2.37 +    #   providing locale-intl.cc disparate libintl.h with externs,
    2.38 +    #   see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=11074
    2.39 +    [ -f %{l_prefix}/include/libintl.h -a -f /usr/include/libintl.h ] && \
    2.40 +        cp /usr/include/libintl.h libstdc++-v3/libsupc++/ || \
    2.41 +    [ -f /usr/include/libintl.h ] || \
    2.42 +        ( echo "A system native gettext installation is not detected. Because GCC"
    2.43 +          echo "C++ components require gettext problems may arise. These problems"
    2.44 +          echo "can appear at build time causing the build to stop with errors"
    2.45 +          echo "containing the words NLS, intl, or locale, or at run time should"
    2.46 +          echo "undefined external symbols libintl_* in libstdc++.a interfere with"
    2.47 +          echo "building other C++ sources."
    2.48 +          echo ""
    2.49 +          echo "To solve such problems, contact the GCC package maintainer and inform"
    2.50 +          echo "of the location of libintl.h header on the system in question."
    2.51 +        ) | %{l_rpmtool} msg -b -t warn
    2.52 +%endif
    2.53  
    2.54  %build
    2.55      #   create build subdirectory
    2.56 @@ -237,9 +256,9 @@
    2.57      CONFIG_SHELL="%{l_bash}" \
    2.58      GREP="%{l_bash}" \
    2.59      ../configure \
    2.60 +        --cache-file=./config.cache \
    2.61          --with-bugurl="http://openpkg.org/" \
    2.62          --with-pkgversion="%{l_openpkg_release -F "OpenPKG-%%t"}" \
    2.63 -        --cache-file=./config.cache \
    2.64          --srcdir=`pwd`/.. \
    2.65          --prefix=%{l_prefix} \
    2.66          --exec-prefix=%{l_prefix} \
    2.67 @@ -422,17 +441,10 @@
    2.68      rm -f  $RPM_BUILD_ROOT%{l_prefix}/lib/*.la   >/dev/null 2>&1 || true
    2.69      rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib64      >/dev/null 2>&1 || true
    2.70      rm -f  $RPM_BUILD_ROOT%{l_prefix}/bin/*-gcc* >/dev/null 2>&1 || true
    2.71 -    rmdir  $RPM_BUILD_ROOT%{l_prefix}/include/gcc* >/dev/null 2>&1 || true
    2.72  %if "%{with_cxx}" == "yes"
    2.73      rm -f  $RPM_BUILD_ROOT%{l_prefix}/bin/*-c++  >/dev/null 2>&1 || true
    2.74      rm -f  $RPM_BUILD_ROOT%{l_prefix}/bin/*-g++  >/dev/null 2>&1 || true
    2.75  %endif
    2.76 -%if "%{with_java}" == "yes"
    2.77 -    rm -f  $RPM_BUILD_ROOT%{l_prefix}/bin/*-gcj  >/dev/null 2>&1 || true
    2.78 -%endif
    2.79 -%if "%{with_fortran}" == "yes"
    2.80 -    rm -f  $RPM_BUILD_ROOT%{l_prefix}/bin/*-gfortran >/dev/null 2>&1 || true
    2.81 -%endif
    2.82      strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
    2.83      for prog in cc1 cc1plus collect2 cpp; do
    2.84          strip $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}/${triple}/[0-9]*/${prog} \