OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 21-Apr-2004 10:26:01
Branch: HEAD Handle: 2004042109260100
Modified files:
openpkg-src/gcc35 gcc35.patch gcc35.spec
Log:
modifying package: gcc35-3.5s20040327 20040327 -> 20040421
Summary:
Revision Changes Path
1.2 +17 -0 openpkg-src/gcc35/gcc35.patch
1.2 +21 -2 openpkg-src/gcc35/gcc35.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gcc35/gcc35.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 gcc35.patch
--- openpkg-src/gcc35/gcc35.patch 27 Mar 2004 08:04:04 -0000 1.1
+++ openpkg-src/gcc35/gcc35.patch 21 Apr 2004 08:26:01 -0000 1.2
@@ -31,3 +31,20 @@
#if defined (HAVE_DECL_MALLOC) && !HAVE_DECL_MALLOC
extern void *malloc (size_t);
#endif
+--- gcc/version.c.orig 2003-08-04 14:50:23.000000000 +0200
++++ gcc/version.c 2003-09-27 15:01:39.000000000 +0200
+@@ -6,7 +6,7 @@
+ please modify this string to indicate that, e.g. by putting your
+ organization's name in parentheses at the end of the string. */
+
+-const char version_string[] = "3.5.0 20040327 (experimental)";
++const char version_string[] = "3.5.0 20040327 (experimental)
(@l_openpkg_release@)";
+
+ /* This is the location of the online document giving instructions for
+ reporting bugs. If you distribute a modified version of GCC,
+@@ -15,4 +15,4 @@
+ forward us bugs reported to you, if you determine that they are
+ not bugs in your modifications.) */
+
+-const char bug_report_url[] = "<URL:http://gcc.gnu.org/bugs.html>";
++const char bug_report_url[] = "<URL:http://www.openpkg.org/>";
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gcc35/gcc35.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 gcc35.spec
--- openpkg-src/gcc35/gcc35.spec 27 Mar 2004 08:04:04 -0000 1.1
+++ openpkg-src/gcc35/gcc35.spec 21 Apr 2004 08:26:01 -0000 1.2
@@ -39,10 +39,13 @@
Group: Compiler
License: GPL
Version: %{V_full}s%{V_snap}
-Release: 20040327
+Release: 20040421
# package options
%option with_cxx yes
+%option with_objc no
+%option with_java no
+%option with_f77 no
%option with_optimize yes
%option with_binutils yes
%option with_threads yes
@@ -84,8 +87,11 @@
%setup -q -n gcc-%{V_full}-%{V_snap}
%patch -p0
%{l_shtool} subst -v -s \
- -e "s;PREFIX_INCLUDE_DIR;PREFIX_INCLUDE_DIR_DISABLED;g" \
+ -e 's;PREFIX_INCLUDE_DIR;PREFIX_INCLUDE_DIR_DISABLED;g' \
gcc/configure
+ %{l_shtool} subst -v -s \
+ -e 's;@l_openpkg_release@;%{l_openpkg_release -F "OpenPKG-%s"};' \
+ gcc/version.c
%build
# create build sub-directory
@@ -117,6 +123,15 @@
%if "%{with_cxx}" == "yes"
l_enable_languages="${l_enable_languages},c++"
%endif
+%if "%{with_objc}" == "yes"
+ l_enable_languages="${l_enable_languages},objc"
+%endif
+%if "%{with_java}" == "yes"
+ l_enable_languages="${l_enable_languages},java"
+%endif
+%if "%{with_f77}" == "yes"
+ l_enable_languages="${l_enable_languages},f77"
+%endif
# disable GNU iconv usage
( echo "am_cv_func_iconv=no"
@@ -206,6 +221,10 @@
mv $RPM_BUILD_ROOT%{l_prefix}/${triple}/include/* \
$RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}/${triple}/[0-9]*/include/ \
>/dev/null 2>&1 || true
+%if "%{with_java}" == "yes"
+ mv $RPM_BUILD_ROOT%{l_prefix}/share/java \
+ $RPM_BUILD_ROOT%{l_prefix}/share/gcc
+%endif
# strip installation tree
rm -rf $RPM_BUILD_ROOT%{l_prefix}/${triple}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
