OpenPKG Specs / changeset

     1.1 --- a/gcc/gcc.patch	Sat Aug 04 14:16:14 2012 +0200
     1.2 +++ b/gcc/gcc.patch	Sat Aug 04 22:02:31 2012 +0200
     1.3 @@ -1,7 +1,6 @@
     1.4  Index: config.guess
     1.5 -diff -Nau config.guess.orig config.guess
     1.6 ---- config.guess.orig	2011-03-21 16:02:29.000000000 +0100
     1.7 -+++ config.guess	2011-03-27 18:06:45.404612233 +0200
     1.8 +--- config.guess.orig	2011-06-06 12:34:35.000000000 +0200
     1.9 ++++ config.guess	2012-07-21 09:15:05.000000000 +0200
    1.10  @@ -194,7 +194,7 @@
    1.11   		release='-gnu'
    1.12   		;;
    1.13 @@ -11,46 +10,10 @@
    1.14   		;;
    1.15   	esac
    1.16   	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
    1.17 -Index: gcc/config/alpha/osf5.h
    1.18 -diff -Nau gcc/config/alpha/osf5.h.orig gcc/config/alpha/osf5.h
    1.19 ---- gcc/config/alpha/osf5.h.orig	2010-11-21 01:54:14.000000000 +0100
    1.20 -+++ gcc/config/alpha/osf5.h	2011-03-27 18:06:45.432326155 +0200
    1.21 -@@ -94,7 +94,7 @@
    1.22 -    constructor and call-frame data structures are not accidentally
    1.23 -    overridden.  */
    1.24 - #define LINK_SPEC  \
    1.25 --  "-G 8 %{O*:-O3} %{!O*:-O1} -S %{static:-non_shared} \
    1.26 -+  "-oldstyle_liblookup %{!o:-o a.out} -G 8 %{O*:-O3} %{!O*:-O1} -S %{static:-non_shared} \
    1.27 -    %{!static:%{shared:-shared -hidden_symbol _GLOBAL_*} \
    1.28 -    %{!shared:-call_shared}} %{pg} %{taso} %{rpath*}"
    1.29 - 
    1.30 -Index: gcc/config/i386/sol2-10.h
    1.31 -diff -Nau gcc/config/i386/sol2-10.h.orig gcc/config/i386/sol2-10.h
    1.32 ---- gcc/config/i386/sol2-10.h.orig	2011-01-26 21:23:17.000000000 +0100
    1.33 -+++ gcc/config/i386/sol2-10.h	2011-03-27 18:06:45.455032224 +0200
    1.34 -@@ -105,7 +105,7 @@
    1.35 -              -R /usr/ucblib/64} \
    1.36 -    %{!compat-bsd: \
    1.37 -      %{!YP,*:%{p|pg:-Y P,/usr/lib/libp/64:/lib/64:/usr/lib/64} \
    1.38 --             %{!p:%{!pg:-Y P,/lib/64:/usr/lib/64}}}}"
    1.39 -+             %{!p:%{!pg:-Y P,/lib/64:/usr/lib/64}}} -rpath-link /lib/64:/usr/lib/64}"
    1.40 - 
    1.41 - #undef LINK_ARCH64_SPEC
    1.42 - #define LINK_ARCH64_SPEC LINK_ARCH64_SPEC_BASE
    1.43 -@@ -122,7 +122,7 @@
    1.44 - #endif
    1.45 - 
    1.46 - #define TARGET_LD_EMULATION "%{m64:-m " X86_64_EMULATION "}" \
    1.47 --			    "%{!m64:-m " I386_EMULATION "} "
    1.48 -+			    "%{!m64:} "
    1.49 - #else
    1.50 - #define TARGET_LD_EMULATION ""
    1.51 - #endif
    1.52  Index: gcc/config/i386/sol2.h
    1.53 -diff -Nau gcc/config/i386/sol2.h.orig gcc/config/i386/sol2.h
    1.54 ---- gcc/config/i386/sol2.h.orig	2011-02-02 17:58:49.000000000 +0100
    1.55 -+++ gcc/config/i386/sol2.h	2011-03-27 18:06:45.458713885 +0200
    1.56 -@@ -73,6 +73,9 @@
    1.57 +--- gcc/config/i386/sol2.h.orig	2011-08-01 14:14:21.000000000 +0200
    1.58 ++++ gcc/config/i386/sol2.h	2012-07-21 09:15:05.000000000 +0200
    1.59 +@@ -100,6 +100,9 @@
    1.60   #undef ASM_QUAD
    1.61   #endif
    1.62   
    1.63 @@ -60,11 +23,22 @@
    1.64   /* The Solaris assembler wants a .local for non-exported aliases.  */
    1.65   #define ASM_OUTPUT_DEF_FROM_DECLS(FILE, DECL, TARGET)	\
    1.66     do {							\
    1.67 +Index: gcc/config/sol2-bi.h
    1.68 +--- gcc/config/sol2-bi.h.orig	2011-07-07 11:24:16.000000000 +0200
    1.69 ++++ gcc/config/sol2-bi.h	2012-07-21 09:31:52.000000000 +0200
    1.70 +@@ -75,7 +75,7 @@
    1.71 +    %{YP,*} \
    1.72 +    %{R*} \
    1.73 +    %{!YP,*:%{p|pg:-Y P,%R/usr/lib/libp/" ARCH64_SUBDIR ":%R/lib/" ARCH64_SUBDIR ":%R/usr/lib/" ARCH64_SUBDIR "}	\
    1.74 +-	   %{!p:%{!pg:-Y P,%R/lib/" ARCH64_SUBDIR ":%R/usr/lib/" ARCH64_SUBDIR "}}}"
    1.75 ++	   %{!p:%{!pg:-Y P,%R/lib/" ARCH64_SUBDIR ":%R/usr/lib/" ARCH64_SUBDIR "}} -rpath-link %R/lib/" ARCH64_SUBDIR ":%R/usr/lib/" ARCH64_SUBDIR "}"
    1.76 + 
    1.77 + #undef LINK_ARCH64_SPEC
    1.78 + #ifndef USE_GLD
    1.79  Index: gcc/config/sol2.h
    1.80 -diff -Nau gcc/config/sol2.h.orig gcc/config/sol2.h
    1.81 ---- gcc/config/sol2.h.orig	2011-01-26 21:23:17.000000000 +0100
    1.82 -+++ gcc/config/sol2.h	2011-03-27 18:06:45.477952967 +0200
    1.83 -@@ -181,8 +181,8 @@
    1.84 +--- gcc/config/sol2.h.orig	2011-08-18 16:47:46.000000000 +0200
    1.85 ++++ gcc/config/sol2.h	2012-07-21 09:15:05.000000000 +0200
    1.86 +@@ -171,8 +171,8 @@
    1.87     "%{h*} %{v:-V} \
    1.88      %{!shared:%{!static:%{rdynamic: " RDYNAMIC_SPEC "}}} \
    1.89      %{static:-dn -Bstatic} \
    1.90 @@ -72,28 +46,26 @@
    1.91  -   %{symbolic:-Bsymbolic -G -dy -z text} \
    1.92  +   %{shared:-G -dy} \
    1.93  +   %{symbolic:-Bsymbolic -G -dy} \
    1.94 -    %{pthreads|pthread|threads:" LIB_THREAD_LDFLAGS_SPEC "} \
    1.95 +    %{pthreads|pthread|fprofile-generate*:" LIB_THREAD_LDFLAGS_SPEC "} \
    1.96      %(link_arch) \
    1.97      %{Qy:} %{!Qn:-Qy}"
    1.98  Index: gcc/system.h
    1.99 -diff -Nau gcc/system.h.orig gcc/system.h
   1.100 ---- gcc/system.h.orig	2011-01-09 13:41:33.000000000 +0100
   1.101 -+++ gcc/system.h	2011-03-27 18:06:45.498233251 +0200
   1.102 -@@ -430,10 +430,6 @@
   1.103 - extern char *strstr (const char *, const char *);
   1.104 +--- gcc/system.h.orig	2012-02-17 00:16:28.000000000 +0100
   1.105 ++++ gcc/system.h	2012-07-21 09:15:05.000000000 +0200
   1.106 +@@ -455,10 +455,6 @@
   1.107 + }
   1.108   #endif
   1.109   
   1.110  -#ifdef HAVE_MALLOC_H
   1.111  -#include <malloc.h>
   1.112  -#endif
   1.113  -
   1.114 - #if defined (HAVE_DECL_MALLOC) && !HAVE_DECL_MALLOC
   1.115 - extern void *malloc (size_t);
   1.116 + #ifdef __cplusplus
   1.117 + extern "C" {
   1.118   #endif
   1.119  Index: libcpp/charset.c
   1.120 -diff -Nau libcpp/charset.c.orig libcpp/charset.c
   1.121  --- libcpp/charset.c.orig	2011-01-03 21:52:22.000000000 +0100
   1.122 -+++ libcpp/charset.c	2011-03-27 18:06:45.522800310 +0200
   1.123 ++++ libcpp/charset.c	2012-07-21 09:15:05.000000000 +0200
   1.124  @@ -75,6 +75,7 @@
   1.125   #define iconv_open(x, y) (errno = EINVAL, (iconv_t)-1)
   1.126   #define iconv(a,b,c,d,e) (errno = EINVAL, (size_t)-1)
   1.127 @@ -103,9 +75,8 @@
   1.128   #endif
   1.129   
   1.130  Index: libcpp/internal.h
   1.131 -diff -Nau libcpp/internal.h.orig libcpp/internal.h
   1.132 ---- libcpp/internal.h.orig	2010-09-29 20:18:38.000000000 +0200
   1.133 -+++ libcpp/internal.h	2011-03-27 18:06:45.537431542 +0200
   1.134 +--- libcpp/internal.h.orig	2012-01-09 09:48:43.000000000 +0100
   1.135 ++++ libcpp/internal.h	2012-07-21 09:15:05.000000000 +0200
   1.136  @@ -29,6 +29,7 @@
   1.137   #if HAVE_ICONV
   1.138   #include <iconv.h>

     2.1 --- a/gcc/gcc.spec	Sat Aug 04 14:16:14 2012 +0200
     2.2 +++ b/gcc/gcc.spec	Sat Aug 04 22:02:31 2012 +0200
     2.3 @@ -22,7 +22,7 @@
     2.4  ##
     2.5  
     2.6  #   package version
     2.7 -%define       V_full         4.6.3
     2.8 +%define       V_full         4.7.1
     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:      20120208
    2.17 +Release:      20120800
    2.18  
    2.19  #   package options
    2.20  %option       with_binutils  yes
    2.21 @@ -56,19 +56,12 @@
    2.22  %endif
    2.23  
    2.24  #   list of sources
    2.25 -Source0:      ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{V_full}/gcc-core-%{V_full}.tar.bz2
    2.26 -Source1:      ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{V_full}/gcc-g++-%{V_full}.tar.bz2
    2.27 -Source2:      ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{V_full}/gcc-objc-%{V_full}.tar.bz2
    2.28 -Source3:      ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{V_full}/gcc-java-%{V_full}.tar.bz2
    2.29 -Source4:      ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{V_full}/gcc-fortran-%{V_full}.tar.bz2
    2.30 +Source0:      ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{V_full}/gcc-%{V_full}.tar.bz2
    2.31  Patch0:       gcc.patch
    2.32 -Patch1:       gcc.patch.spawn
    2.33  
    2.34  #   build information
    2.35 -Prefix:       %{l_prefix}
    2.36 -BuildRoot:    %{l_buildroot}
    2.37 -BuildPreReq:  OpenPKG, openpkg >= 20060823, make
    2.38 -PreReq:       OpenPKG, openpkg >= 20060823
    2.39 +BuildPreReq:  OpenPKG, openpkg >= 20100101, make
    2.40 +PreReq:       OpenPKG, openpkg >= 20100101
    2.41  BuildPreReq:  mpc, mpfr, gmp
    2.42  PreReq:       mpc, mpfr, gmp
    2.43  %if "%{with_binutils}" == "yes"
    2.44 @@ -83,8 +76,6 @@
    2.45  BuildPreReq:  zlib, infozip
    2.46  PreReq:       zlib
    2.47  %endif
    2.48 -AutoReq:      no
    2.49 -AutoReqProv:  no
    2.50  
    2.51  %description
    2.52      The GNU Compiler Collection (GCC) provides standard conforming and
    2.53 @@ -97,25 +88,12 @@
    2.54          url       = ftp://gcc.gnu.org/pub/gcc/releases/
    2.55          regex     = gcc-(4\.\d+\.\d+)
    2.56          url       = ftp://gcc.gnu.org/pub/gcc/releases/gcc-__NEWVER__/
    2.57 -        regex     = gcc-core-(\d+\.\d+\.\d+)\.tar\.bz2
    2.58 +        regex     = gcc-(\d+\.\d+\.\d+)\.tar\.bz2
    2.59      }
    2.60  
    2.61  %prep
    2.62      %setup -q
    2.63 -%if "%{with_cxx}" == "yes"
    2.64 -    %setup -q -T -D -b 1
    2.65 -%endif
    2.66 -%if "%{with_objc}" == "yes"
    2.67 -    %setup -q -T -D -b 2
    2.68 -%endif
    2.69 -%if "%{with_java}" == "yes"
    2.70 -    %setup -q -T -D -b 3
    2.71 -%endif
    2.72 -%if "%{with_fortran}" == "yes"
    2.73 -    %setup -q -T -D -b 4
    2.74 -%endif
    2.75      %patch -p0
    2.76 -    %patch -p0 -P 1
    2.77      %{l_shtool} subst \
    2.78          -e 's;\(instname="\$dir/\$name"\)i;\1;' \
    2.79          ltmain.sh
    2.80 @@ -243,6 +221,7 @@
    2.81      #   platforms failing 'compare' make target (see prep as well)
    2.82      case "%{l_platform -t}" in
    2.83          *i?86-sunos*  ) echo "gcc_cv_prog_cmp_skip=true" >>config.cache ;;
    2.84 +        *amd64-sunos* ) echo "gcc_cv_prog_cmp_skip=true" >>config.cache ;;
    2.85          *amd64-linux* ) echo "gcc_cv_prog_cmp_skip=true" >>config.cache ;;
    2.86      esac
    2.87