From 863805b67d5e5a09933d5bfc3b6d07b1e14002db Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Fri, 2 Nov 2007 13:26:52 +0000 Subject: [PATCH] Stefan Fiedler: gcc41: replace patches with the ones from cross-lfs.org [2007100300533533400] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8759 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/gcc/gcc41/auxbase.patch | 50 ----- .../gcc-4.1.1-cross_search_paths-1.patch | 49 +++++ .../base/gcc/gcc41/gcc-4.1.2-posix-1.patch | 203 ++++++++++++++++++ package/base/gcc/gcc41/install_so.patch | 39 ---- .../base/gcc/gcc41/no-install-libiberty.patch | 36 ---- package/base/gcc/gcc41/no-install-zlib.patch | 30 --- 6 files changed, 252 insertions(+), 155 deletions(-) delete mode 100644 package/base/gcc/gcc41/auxbase.patch create mode 100644 package/base/gcc/gcc41/gcc-4.1.1-cross_search_paths-1.patch create mode 100644 package/base/gcc/gcc41/gcc-4.1.2-posix-1.patch delete mode 100644 package/base/gcc/gcc41/install_so.patch delete mode 100644 package/base/gcc/gcc41/no-install-libiberty.patch delete mode 100644 package/base/gcc/gcc41/no-install-zlib.patch diff --git a/package/base/gcc/gcc41/auxbase.patch b/package/base/gcc/gcc41/auxbase.patch deleted file mode 100644 index 203b1ae40..000000000 --- a/package/base/gcc/gcc41/auxbase.patch +++ /dev/null @@ -1,50 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/gcc/gcc41/auxbase.patch -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - - -This fix is for passing -auxbase or -auxbase-strip thru the "gcc" driver -programs (e.g. 'gcc') to the backend compilers (e.g. 'cc1'). We will need -this for supporting feedback compilation using the ROCK toolchain... - - - Clifford - ---- ./gcc/gcc.h.orig 2004-09-24 15:42:27.000000000 +0200 -+++ ./gcc/gcc.h 2004-09-24 15:43:24.000000000 +0200 -@@ -46,6 +46,7 @@ - (!strcmp (STR, "Tdata") || !strcmp (STR, "Ttext") \ - || !strcmp (STR, "Tbss") || !strcmp (STR, "include") \ - || !strcmp (STR, "imacros") || !strcmp (STR, "aux-info") \ -+ || !strcmp (STR, "auxbase") || !strcmp (STR, "auxbase-strip") \ - || !strcmp (STR, "idirafter") || !strcmp (STR, "iprefix") \ - || !strcmp (STR, "iwithprefix") || !strcmp (STR, "iwithprefixbefore") \ - || !strcmp (STR, "isystem") || !strcmp (STR, "-param") \ ---- ./gcc/gcc.c.orig 2004-09-24 15:44:36.000000000 +0200 -+++ ./gcc/gcc.c 2004-09-24 15:48:48.000000000 +0200 -@@ -788,9 +788,9 @@ - /* NB: This is shared amongst all front-ends. */ - static const char *cc1_options = - "%{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\ -- %1 %{!Q:-quiet} -dumpbase %B %{d*} %{m*} %{a*}\ -+ %1 %{!Q:-quiet} -dumpbase %B %{d*} %{m*}\ - %{c|S:%{o*:-auxbase-strip %*}%{!o*:-auxbase %b}}%{!c:%{!S:-auxbase %b}}\ -- %{g*} %{O*} %{W*&pedantic*} %{w} %{std*&ansi&trigraphs}\ -+ %{a*} %{g*} %{O*} %{W*&pedantic*} %{w} %{std*&ansi&trigraphs}\ - %{v:-version} %{pg:-p} %{p} %{f*} %{undef}\ - %{Qn:-fno-ident} %{--help:--help}\ - %{--target-help:--target-help}\ diff --git a/package/base/gcc/gcc41/gcc-4.1.1-cross_search_paths-1.patch b/package/base/gcc/gcc41/gcc-4.1.1-cross_search_paths-1.patch new file mode 100644 index 000000000..18803bc6f --- /dev/null +++ b/package/base/gcc/gcc41/gcc-4.1.1-cross_search_paths-1.patch @@ -0,0 +1,49 @@ +Submitted by: Ryan Oliver +Date: 2005-05-02 +Initial Package Version: 4.0.1 +Origin: Ryan Oliver (issue reported by Erik-Jan Post) + Rediffed against 4.1.0 by Chris Staub +Upstream Status: N/A +Description: + Removes standard_exec_prefix_2 from library search path when cross-compiling. + Removes both standard_exec_prefix_1 and standard_exec_prefix_2 from the gcc + executable search path when cross-compiling. + + ie: if cross_compile = 1 in the specs file, do not + - do not add /usr/lib/gcc/${TARGET}/${GCC_VER} to the library search path + - do not add /usr/lib/gcc/${TARGET}/${GCC_VER} or + /usr/libexec/gcc/${TARGET}/${GCC_VER} + to the executable search path + + This avoids the possibility of linking in libraries from the host if they + exist under those directories. + +diff -Naur gcc-4.1.0.orig/gcc/gcc.c gcc-4.1.0/gcc/gcc.c +--- gcc-4.1.0.orig/gcc/gcc.c 2006-01-21 13:29:08.000000000 -0500 ++++ gcc-4.1.0/gcc/gcc.c 2006-02-28 22:20:05.000000000 -0500 +@@ -3818,16 +3818,22 @@ + PREFIX_PRIORITY_LAST, 2, 0); + add_prefix (&exec_prefixes, standard_exec_prefix, "BINUTILS", + PREFIX_PRIORITY_LAST, 2, 0); +- add_prefix (&exec_prefixes, standard_exec_prefix_1, "BINUTILS", ++ if (*cross_compile == '0') ++ { ++ add_prefix (&exec_prefixes, standard_exec_prefix_1, "BINUTILS", + PREFIX_PRIORITY_LAST, 2, 0); +- add_prefix (&exec_prefixes, standard_exec_prefix_2, "BINUTILS", ++ add_prefix (&exec_prefixes, standard_exec_prefix_2, "BINUTILS", + PREFIX_PRIORITY_LAST, 2, 0); ++ } + #endif + + add_prefix (&startfile_prefixes, standard_exec_prefix, "BINUTILS", + PREFIX_PRIORITY_LAST, 1, 0); +- add_prefix (&startfile_prefixes, standard_exec_prefix_2, "BINUTILS", ++ if (*cross_compile == '0') ++ { ++ add_prefix (&startfile_prefixes, standard_exec_prefix_2, "BINUTILS", + PREFIX_PRIORITY_LAST, 1, 0); ++ } + + tooldir_prefix = concat (tooldir_base_prefix, spec_machine, + dir_separator_str, NULL); diff --git a/package/base/gcc/gcc41/gcc-4.1.2-posix-1.patch b/package/base/gcc/gcc41/gcc-4.1.2-posix-1.patch new file mode 100644 index 000000000..1f4a441d4 --- /dev/null +++ b/package/base/gcc/gcc41/gcc-4.1.2-posix-1.patch @@ -0,0 +1,203 @@ +Copied from linuxfromscratch.org and rediffed against 4.1.2 for ROCK Linux. + +Submitted By: Jim Gifford (patches at jg555 dot com) +Date: 2005-08-27 +Initial Package Version: 4.0.1 +Origin: Jim Gifford + Rediffed against 4.1.0 by Chris Staub +Upstream Status: On Hold +Description: Makes GCC Posix Compliant + +--- gcc-4.1.2/contrib/test_summary 2004-08-26 07:51:22.000000000 +0200 ++++ src.gcc41.1189992263.16998.3710433526/gcc-4.1.2/contrib/test_summary 2007-09-17 03:26:52.000000000 +0200 +@@ -106,7 +106,7 @@ + srcdir = configflags; + sub(/\/configure .*/, "", srcdir); + printf "LAST_UPDATED: "; +- system("tail -1 " srcdir "/LAST_UPDATED"); ++ system("tail -n 1 " srcdir "/LAST_UPDATED"); + print ""; + + sub(/^[^ ]*\/configure */, " ", configflags); +--- gcc-4.1.2/gcc/configure 2006-11-13 23:09:55.000000000 +0100 ++++ src.gcc41.1189992263.16998.3710433526/gcc-4.1.2/gcc/configure 2007-09-17 03:26:52.000000000 +0200 +@@ -14318,7 +14318,7 @@ + # and we got the correct data, then succeed. + if test x$gcc_cv_objdump != x \ + && $gcc_cv_objdump -s -j .eh_frame conftest.o 2>/dev/null \ +- | tail -3 > conftest.got \ ++ | tail -n 3 > conftest.got \ + && { cmp conftest.lit conftest.got > /dev/null 2>&1 \ + || cmp conftest.big conftest.got > /dev/null 2>&1; } + then +--- gcc-4.1.2/gcc/configure.ac 2006-11-13 23:09:55.000000000 +0100 ++++ src.gcc41.1189992263.16998.3710433526/gcc-4.1.2/gcc/configure.ac 2007-09-17 03:26:52.000000000 +0200 +@@ -2124,7 +2124,7 @@ + # and we got the correct data, then succeed. + if test x$gcc_cv_objdump != x \ + && $gcc_cv_objdump -s -j .eh_frame conftest.o 2>/dev/null \ +- | tail -3 > conftest.got \ ++ | tail -n 3 > conftest.got \ + && { cmp conftest.lit conftest.got > /dev/null 2>&1 \ + || cmp conftest.big conftest.got > /dev/null 2>&1; } + then +--- gcc-4.1.2/libjava/configure 2007-02-14 06:17:22.000000000 +0100 ++++ src.gcc41.1189992263.16998.3710433526/gcc-4.1.2/libjava/configure 2007-09-17 03:26:52.000000000 +0200 +@@ -6736,8 +6736,8 @@ + echo $ECHO_N "checking whether 'ld' is at least 2.13... $ECHO_C" >&6 + LD_PROG=`$CC --print-prog-name=ld` + LD_VERSION=`$LD_PROG --version` +-LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 1 | cut -d ' ' -f 4` +-LD_VERSION_MINOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 2` ++LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 1 | cut -d ' ' -f 4` ++LD_VERSION_MINOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 2` + if expr "$LD_VERSION_MAJOR" \> 2 > /dev/null; then + LD_OK="ok" + else +--- gcc-4.1.2/libjava/mingwld.m4 2005-08-23 00:36:35.000000000 +0200 ++++ src.gcc41.1189992263.16998.3710433526/gcc-4.1.2/libjava/mingwld.m4 2007-09-17 03:26:52.000000000 +0200 +@@ -3,8 +3,8 @@ + AC_MSG_CHECKING(whether 'ld' is at least 2.13) + LD_PROG=`$CC --print-prog-name=ld` + LD_VERSION=`$LD_PROG --version` +-LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 1 | cut -d ' ' -f 4` +-LD_VERSION_MINOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 2` ++LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 1 | cut -d ' ' -f 4` ++LD_VERSION_MINOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 2` + if expr "$LD_VERSION_MAJOR" \> 2 > /dev/null; then + LD_OK="ok" + else +--- gcc-4.1.2/libstdc++-v3/acinclude.m4 2007-01-29 11:51:01.000000000 +0100 ++++ src.gcc41.1189992263.16998.3710433526/gcc-4.1.2/libstdc++-v3/acinclude.m4 2007-09-17 07:33:27.000000000 +0200 +@@ -224,7 +224,7 @@ + # does some of this, but throws away the result. + if test x"$with_gnu_ld" = x"yes"; then + changequote(,) +- ldver=`$LD --version 2>/dev/null | head -1 | \ ++ ldver=`$LD --version 2>/dev/null | head -n 1 | \ + sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'` + changequote([,]) + glibcxx_gnu_ld_version=`echo $ldver | \ +--- gcc-4.1.2/libstdc++-v3/configure 2007-01-29 11:51:01.000000000 +0100 ++++ src.gcc41.1189992263.16998.3710433526/gcc-4.1.2/libstdc++-v3/configure 2007-09-17 07:37:10.000000000 +0200 +@@ -8280,7 +8280,7 @@ + # does some of this, but throws away the result. + if test x"$with_gnu_ld" = x"yes"; then + +- ldver=`$LD --version 2>/dev/null | head -1 | \ ++ ldver=`$LD --version 2>/dev/null | head -n 1 | \ + sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'` + + glibcxx_gnu_ld_version=`echo $ldver | \ +@@ -53121,7 +53121,7 @@ + # does some of this, but throws away the result. + if test x"$with_gnu_ld" = x"yes"; then + +- ldver=`$LD --version 2>/dev/null | head -1 | \ ++ ldver=`$LD --version 2>/dev/null | head -n 1 | \ + sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'` + + glibcxx_gnu_ld_version=`echo $ldver | \ +@@ -74455,7 +74455,7 @@ + # does some of this, but throws away the result. + if test x"$with_gnu_ld" = x"yes"; then + +- ldver=`$LD --version 2>/dev/null | head -1 | \ ++ ldver=`$LD --version 2>/dev/null | head -n 1 | \ + sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'` + + glibcxx_gnu_ld_version=`echo $ldver | \ +@@ -75952,7 +75952,7 @@ + # does some of this, but throws away the result. + if test x"$with_gnu_ld" = x"yes"; then + +- ldver=`$LD --version 2>/dev/null | head -1 | \ ++ ldver=`$LD --version 2>/dev/null | head -n 1 | \ + sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'` + + glibcxx_gnu_ld_version=`echo $ldver | \ +@@ -77325,7 +77325,7 @@ + # does some of this, but throws away the result. + if test x"$with_gnu_ld" = x"yes"; then + +- ldver=`$LD --version 2>/dev/null | head -1 | \ ++ ldver=`$LD --version 2>/dev/null | head -n 1 | \ + sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'` + + glibcxx_gnu_ld_version=`echo $ldver | \ +@@ -79485,7 +79485,7 @@ + # does some of this, but throws away the result. + if test x"$with_gnu_ld" = x"yes"; then + +- ldver=`$LD --version 2>/dev/null | head -1 | \ ++ ldver=`$LD --version 2>/dev/null | head -n 1 | \ + sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'` + + glibcxx_gnu_ld_version=`echo $ldver | \ +@@ -80304,7 +80304,7 @@ + # does some of this, but throws away the result. + if test x"$with_gnu_ld" = x"yes"; then + +- ldver=`$LD --version 2>/dev/null | head -1 | \ ++ ldver=`$LD --version 2>/dev/null | head -n 1 | \ + sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'` + + glibcxx_gnu_ld_version=`echo $ldver | \ +@@ -81679,7 +81679,7 @@ + # does some of this, but throws away the result. + if test x"$with_gnu_ld" = x"yes"; then + +- ldver=`$LD --version 2>/dev/null | head -1 | \ ++ ldver=`$LD --version 2>/dev/null | head -n 1 | \ + sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'` + + glibcxx_gnu_ld_version=`echo $ldver | \ +@@ -83446,7 +83446,7 @@ + # does some of this, but throws away the result. + if test x"$with_gnu_ld" = x"yes"; then + +- ldver=`$LD --version 2>/dev/null | head -1 | \ ++ ldver=`$LD --version 2>/dev/null | head -n 1 | \ + sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'` + + glibcxx_gnu_ld_version=`echo $ldver | \ +@@ -84663,7 +84663,7 @@ + # does some of this, but throws away the result. + if test x"$with_gnu_ld" = x"yes"; then + +- ldver=`$LD --version 2>/dev/null | head -1 | \ ++ ldver=`$LD --version 2>/dev/null | head -n 1 | \ + sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'` + + glibcxx_gnu_ld_version=`echo $ldver | \ +@@ -85664,7 +85664,7 @@ + # does some of this, but throws away the result. + if test x"$with_gnu_ld" = x"yes"; then + +- ldver=`$LD --version 2>/dev/null | head -1 | \ ++ ldver=`$LD --version 2>/dev/null | head -n 1 | \ + sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'` + + glibcxx_gnu_ld_version=`echo $ldver | \ +--- gcc-4.1.2/ltcf-c.sh 2005-11-18 23:53:08.000000000 +0100 ++++ src.gcc41.1189992263.16998.3710433526/gcc-4.1.2/ltcf-c.sh 2007-09-17 03:26:53.000000000 +0200 +@@ -153,7 +153,7 @@ + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is. + # If DATA tags from a recent dlltool are present, honour them! +- archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then ++ archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname-def; + else + echo EXPORTS > $output_objdir/$soname-def; +--- gcc-4.1.2/ltcf-gcj.sh 2005-07-16 04:30:53.000000000 +0200 ++++ src.gcc41.1189992263.16998.3710433526/gcc-4.1.2/ltcf-gcj.sh 2007-09-17 03:26:53.000000000 +0200 +@@ -156,7 +156,7 @@ + # If the export-symbols file already is a .def file (1st line + # is EXPORTS), use it as is. + # If DATA tags from a recent dlltool are present, honour them! +- archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then ++ archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then + cp $export_symbols $output_objdir/$soname-def; + else + echo EXPORTS > $output_objdir/$soname-def; diff --git a/package/base/gcc/gcc41/install_so.patch b/package/base/gcc/gcc41/install_so.patch deleted file mode 100644 index 1288dba8b..000000000 --- a/package/base/gcc/gcc41/install_so.patch +++ /dev/null @@ -1,39 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/gcc/gcc41/install_so.patch -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./install-sh.orig 2003-07-20 11:40:28.000000000 +0200 -+++ ./install-sh 2003-11-02 17:04:13.000000000 +0100 -@@ -279,8 +279,15 @@ - && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && - - # Now rename the file to the real destination. -- { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ -- || { -+ { if echo $dstdir/$dstfile | grep -q 'lib/.*\.so' ; then -+ $doit $mvcmd $dsttmp $dstdir/$dstfile -+ rc=$? -+ else -+ $doit $rmcmd -f $dstdir/$dstfile && -+ $doit $mvcmd $dsttmp $dstdir/$dstfile -+ rc=$? -+ fi -+ [ $rc -eq 0 ] || { - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. diff --git a/package/base/gcc/gcc41/no-install-libiberty.patch b/package/base/gcc/gcc41/no-install-libiberty.patch deleted file mode 100644 index dfcf4ee29..000000000 --- a/package/base/gcc/gcc41/no-install-libiberty.patch +++ /dev/null @@ -1,36 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/gcc/gcc41/no-install-libiberty.patch -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./libiberty/Makefile.in.orig 2003-03-23 06:16:03.000000000 -0400 -+++ ./libiberty/Makefile.in 2003-05-15 17:02:18.000000000 -0400 -@@ -263,10 +263,10 @@ - install: install_to_$(INSTALL_DEST) install-subdir - - install_to_libdir: all -- ${mkinstalldirs} $(DESTDIR)$(libdir)$(MULTISUBDIR) -- $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB)n -- ( cd $(DESTDIR)$(libdir)$(MULTISUBDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n ) -- mv -f $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB) -+ #${mkinstalldirs} $(DESTDIR)$(libdir)$(MULTISUBDIR) -+ #$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB)n -+ #( cd $(DESTDIR)$(libdir)$(MULTISUBDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n ) -+ #mv -f $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB) - if test -n "${target_header_dir}"; then \ - case "${target_header_dir}" in \ - /*) thd=${target_header_dir};; \ diff --git a/package/base/gcc/gcc41/no-install-zlib.patch b/package/base/gcc/gcc41/no-install-zlib.patch deleted file mode 100644 index 736adb47f..000000000 --- a/package/base/gcc/gcc41/no-install-zlib.patch +++ /dev/null @@ -1,30 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/gcc/gcc41/no-install-zlib.patch -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./zlib/Makefile.in.orig 2002-11-25 21:28:45.000000000 +0200 -+++ ./zlib/Makefile.in 2003-01-25 15:39:06.000000000 +0200 -@@ -510,7 +510,7 @@ - for dir in "$(DESTDIR)$(toolexeclibdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done --install: install-am -+install: - install-exec: install-exec-am - install-data: install-data-am - uninstall: uninstall-am