OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 19-Sep-2005 22:07:29
Branch: HEAD Handle: 2005091921072800
Modified files:
openpkg-src/gcc gcc.patch gcc.spec
Log:
cleanup indentation of amd64 patch application and move solaris hack
into .patch file where similar hacks already exists
Summary:
Revision Changes Path
1.22 +14 -0 openpkg-src/gcc/gcc.patch
1.114 +2 -11 openpkg-src/gcc/gcc.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gcc/gcc.patch
============================================================================
$ cvs diff -u -r1.21 -r1.22 gcc.patch
--- openpkg-src/gcc/gcc.patch 20 May 2005 07:41:46 -0000 1.21
+++ openpkg-src/gcc/gcc.patch 19 Sep 2005 20:07:28 -0000 1.22
@@ -47,3 +47,17 @@
#if defined (HAVE_DECL_MALLOC) && !HAVE_DECL_MALLOC
extern void *malloc (size_t);
#endif
+Index: gcc/config/sol2.h
+--- gcc/config/sol2.h.orig 2004-07-17 23:18:56 +0200
++++ gcc/config/sol2.h 2005-09-19 22:01:15 +0200
+@@ -144,8 +144,8 @@
+ "%{h*} %{v:-V} \
+ %{b} %{Wl,*:%*} \
+ %{static:-dn -Bstatic} \
+- %{shared:-G -dy %{!mimpure-text:-z text}} \
+- %{symbolic:-Bsymbolic -G -dy -z text} \
++ %{shared:-G -dy} \
++ %{symbolic:-Bsymbolic -G -dy} \
+ %(link_arch) \
+ %{Qy:} %{!Qn:-Qy}"
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gcc/gcc.spec
============================================================================
$ cvs diff -u -r1.113 -r1.114 gcc.spec
--- openpkg-src/gcc/gcc.spec 19 Sep 2005 16:12:07 -0000 1.113
+++ openpkg-src/gcc/gcc.spec 19 Sep 2005 20:07:28 -0000 1.114
@@ -91,9 +91,9 @@
%setup -q
%patch -p0
case "%{l_platform -t}" in
- amd64*-linux* )
+ amd64*-linux* )
%{l_patch} -p0 <%{PATCH gcc.patch.amd64}
- ;;
+ ;;
esac
%{l_shtool} subst -v -s \
-e 's;PREFIX_INCLUDE_DIR;PREFIX_INCLUDE_DIR_DISABLED;g' \
@@ -271,15 +271,6 @@
$RPM_BUILD_ROOT%{l_prefix}/share/gcc
%endif
-%if "%{with_binutils}" == "no"
- # allow relocations in shared objects under Solaris
- case "%{l_platform -t}" in
- *-sunos* ) %{l_shtool} subst \
- -e 's/-z text}/}/g' \
-
$RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}/${triple}/[0-9]*/specs;;
- esac
-%endif
-
# strip installation tree
rm -rf $RPM_BUILD_ROOT%{l_prefix}/${triple}
rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
