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 openpkg-web openpkg$ Date: 08-Jul-2003 15:41:50 Branch: HEAD Handle: 2003070814414801 Added files: openpkg-re/vcheck vc.gcc34 openpkg-src/gcc34 gcc34.patch gcc34.spec Modified files: openpkg-web news.txt Log: provide new GCC snapshot package based on their HEAD (= 3.4) version Summary: Revision Changes Path 1.1 +11 -0 openpkg-re/vcheck/vc.gcc34 1.1 +20 -0 openpkg-src/gcc34/gcc34.patch 1.1 +241 -0 openpkg-src/gcc34/gcc34.spec 1.5445 +1 -0 openpkg-web/news.txt ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-re/vcheck/vc.gcc34 ============================================================================ $ cvs diff -u -r0 -r1.1 vc.gcc34 --- /dev/null 2003-07-08 15:41:48.000000000 +0200 +++ vc.gcc34 2003-07-08 15:41:48.000000000 +0200 @@ -0,0 +1,11 @@ +config = { +} + +prog gcc34 = { + version = 20030702 + url = ftp://gcc.gnu.org/pub/gcc/snapshots/ + regex = (\d+\.\d+-\d{8}) + url = ftp://gcc.gnu.org/pub/gcc/snapshots/__NEWVER__/ + regex = gcc-(__VER__)\.tar\.bz2 +} + @@ . patch -p0 <<'@@ .' Index: openpkg-src/gcc34/gcc34.patch ============================================================================ $ cvs diff -u -r0 -r1.1 gcc34.patch --- /dev/null 2003-07-08 15:41:50.000000000 +0200 +++ gcc34.patch 2003-07-08 15:41:50.000000000 +0200 @@ -0,0 +1,20 @@ +--- config.guess.orig Thu Jan 30 23:32:36 2003 ++++ config.guess Wed Feb 5 09:54:43 2003 +@@ -188,7 +188,7 @@ + release='-gnu' + ;; + *) +- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` ++ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'` + ;; + esac + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: +--- gcc/config/i386/sol2.h.dist Thu Feb 27 15:00:54 2003 ++++ gcc/config/i386/sol2.h Thu Feb 27 14:20:50 2003 +@@ -160,3 +160,5 @@ + + /* The Solaris assembler does not support .quad. Do not use it. */ + #undef ASM_QUAD ++#undef DEFAULT_PCC_STRUCT_RETURN ++#define DEFAULT_PCC_STRUCT_RETURN 1 + @@ . patch -p0 <<'@@ .' Index: openpkg-src/gcc34/gcc34.spec ============================================================================ $ cvs diff -u -r0 -r1.1 gcc34.spec --- /dev/null 2003-07-08 15:41:50.000000000 +0200 +++ gcc34.spec 2003-07-08 15:41:50.000000000 +0200 @@ -0,0 +1,241 @@ +## +## gcc34.spec -- OpenPKG RPM Specification +## Copyright (c) 2000-2003 Cable & Wireless Deutschland GmbH +## Copyright (c) 2000-2003 The OpenPKG Project <http://www.openpkg.org/> +## Copyright (c) 2000-2003 Ralf S. Engelschall <[EMAIL PROTECTED]> +## +## Permission to use, copy, modify, and distribute this software for +## any purpose with or without fee is hereby granted, provided that +## the above copyright notice and this permission notice appear in all +## copies. +## +## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED +## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR +## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF +## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +## SUCH DAMAGE. +## + +# package version +%define V_full 3.4 +%define V_comp 34 +%define V_snap_dash 2003-07-02 +%define V_snap_comp 20030702 + +# package information +Name: gcc34 +Summary: GNU Compiler Collection +URL: http://gcc.gnu.org/ +Vendor: Free Software Foundation +Packager: The OpenPKG Project +Distribution: OpenPKG [EVAL] +Group: Language +License: GPL +Version: %{V_full}s%{V_snap_comp} +Release: 20030708 + +# package options +%option with_cxx yes +%option with_optimize yes +%option with_binutils yes +%option with_threads yes +%option with_gcc no + +# list of sources +Source0: ftp://gcc.gnu.org/pub/gcc/snapshots/%{V_full}-%{V_snap_dash}/gcc-%{V_snap_comp}.tar.bz2 +Patch0: gcc34.patch + +# build information +Prefix: %{l_prefix} +BuildRoot: %{l_buildroot} +BuildPreReq: OpenPKG, openpkg >= 20030103, make, flex, bison +PreReq: OpenPKG, openpkg >= 20030103 +%if "%{with_binutils}" == "yes" +BuildPreReq: binutils >= 2.13 +PreReq: binutils >= 2.13 +%endif +AutoReq: no +AutoReqProv: no +%if "%{with_gcc}" == "yes" +Provides: gcc = %{version}-%{release} +%endif + +%description + The GNU Compiler Collection (GCC) provides a standard conforming and + highly portable ISO C and ISO C++ compiler. + +%prep + %setup -q -n gcc-%{V_snap_comp} + %patch -p0 + %{l_shtool} subst -v -s \ + -e "s;PREFIX_INCLUDE_DIR;PREFIX_INCLUDE_DIR_DISABLED;g" \ + gcc/configure + +%build + # create build sub-directory + mkdir obj + cd obj + + # determine ld(1) and as(1) usage + l_with_gnu_ld_as="" +%if "%{with_binutils}" == "yes" + l_with_gnu_ld_as="${l_with_gnu_ld_as} --with-gnu-ld --with-ld=%{l_prefix}/bin/ld" + l_with_gnu_ld_as="${l_with_gnu_ld_as} --with-gnu-as --with-as=%{l_prefix}/bin/as" +%else + case "%{l_target}" in + *-linux* | *-freebsd* ) + l_with_gnu_ld_as="${l_with_gnu_ld_as} --with-gnu-as --with-gnu-ld" + ;; + esac +%endif + + # determine threads usage +%if "%{with_threads}" == "yes" + l_enable_threads="posix" +%else + l_enable_threads="single" +%endif + + # determine language usage + l_enable_languages="c" +%if "%{with_cxx}" == "yes" + l_enable_languages="${l_enable_languages},c++" +%endif + + # configure the package + CC="%{l_cc}" \ + CFLAGS="%{l_cflags}" \ + ../configure \ + --prefix=%{l_prefix} \ + --exec-prefix=%{l_prefix} \ + --includedir=%{l_prefix}/include/gcc%{V_comp} \ + --with-gxx-include-dir=%{l_prefix}/include/g++%{V_comp} \ + --with-local-prefix=%{l_prefix}/lib/gcc%{V_comp}-lib \ + --enable-languages="${l_enable_languages}" \ + --enable-threads="${l_enable_threads}" \ + --disable-maintainer-mode \ + --disable-shared \ + --disable-nls \ + ${l_with_gnu_ld_as} + + # explicitly redirect remaining gcc-lib directories + %{l_shtool} subst -v -s \ + -e "s;/gcc-lib/;/gcc%{V_comp}-lib/;" \ + `find . -name Makefile -type f -print` + + # determine build flags + l_cflags="" + l_boot_cflags="" + l_libcflags="-g" + l_libcxxflags="-g" +%if "%{with_binutils}" == "yes" + # at least GNU as from GNU binutils supports -pipe always + l_boot_cflags="$l_boot_cflags -pipe" + l_libcxxflags="$l_libcxxflags -pipe" +%endif +%if "%{with_optimize}" == "yes" + # conservatively optimize the generated program code + # (also _tune_ for particular CPUs, but _without_ requiring these CPUs!) + l_cflags="$l_cflags -O" + l_boot_cflags="$l_boot_cflags -O2 -fomit-frame-pointer -funroll-loops" + case "%{l_target}" in + *x86-* ) l_boot_cflags="$l_boot_cflags -mtune=pentium3" ;; + *sparc64-* ) l_boot_cflags="$l_boot_cflags -mtune=v9" ;; + esac + l_libcxxflags="$l_libcxxflags -O2 -fno-implicit-templates" +%else + # else do no optimizations at all to reduce problems to minimum in advance + l_boot_cflags="$l_boot_cflags -O0" + l_libcxxflags="$l_libcxxflags -O0" +%endif + + # build the package + %{l_make} %{l_mflags} \ + MAKE="%{l_make} %{l_mflags}" \ + BOOT_CFLAGS="${l_boot_cflags}" \ + CFLAGS="${l_cflags}" \ + LIBCFLAGS="${l_libcflags}" \ + LIBCXXFLAGS="${l_libcxxflags}" \ + bootstrap-lean + +%install + rm -rf $RPM_BUILD_ROOT + + # fetch GNU platform triple + triple=`./config.guess` + triple=`./config.sub ${triple}` + + # perform the standard installation procedure + ( cd obj + %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT ) + + # cleanup installation tree + mv $RPM_BUILD_ROOT%{l_prefix}/lib/lib*.a \ + $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}-lib/${triple}/%{V_full}/ + for multilib in `$RPM_BUILD_ROOT%{l_prefix}/bin/gcc --print-multi-lib`; do + subdir=`echo "$multilib" | sed -e 's/;.*$//'` + [ ".$subdir" = .. ] && continue + mv $RPM_BUILD_ROOT%{l_prefix}/lib/$subdir/lib*.a \ + $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}-lib/${triple}/%{V_full}/$subdir/ + rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/$subdir + done + mv $RPM_BUILD_ROOT%{l_prefix}/${triple}/include/* \ + $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}-lib/${triple}/%{V_full}/include/ \ + >/dev/null 2>&1 || true + + # strip installation tree + rm -rf $RPM_BUILD_ROOT%{l_prefix}/${triple} + rm -rf $RPM_BUILD_ROOT%{l_prefix}/man/man7 >/dev/null 2>&1 || true + rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/*.la >/dev/null 2>&1 || true + rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/*-gcc* >/dev/null 2>&1 || true +%if "%{with_cxx}" == "yes" + rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/*-c++ >/dev/null 2>&1 || true + rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/*-g++ >/dev/null 2>&1 || true +%endif + strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true + for prog in cc1 cc1plus collect2 cpp; do + strip $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}-lib/${triple}/%{V_full}/${prog} \ + >/dev/null 2>&1 || true + done + + # bump up installation tree + ln $RPM_BUILD_ROOT%{l_prefix}/bin/gcc \ + $RPM_BUILD_ROOT%{l_prefix}/bin/cc + ln $RPM_BUILD_ROOT%{l_prefix}/man/man1/gcc.1 \ + $RPM_BUILD_ROOT%{l_prefix}/man/man1/cc.1 +%if "%{with_cxx}" == "yes" + ln $RPM_BUILD_ROOT%{l_prefix}/man/man1/g++.1 \ + $RPM_BUILD_ROOT%{l_prefix}/man/man1/c++.1 +%endif + + # resolve filename conflicts +%if "%{with_gcc}" != "yes" && "%{V_comp}" != "" + ( cd $RPM_BUILD_ROOT%{l_prefix}/bin + for file in *; do + mv ${file} ${file}%{V_comp} + done ) + ( cd $RPM_BUILD_ROOT%{l_prefix}/info + for file in *; do + mv ${file} `echo ${file} | sed -e 's;^\([^.]*\)\(\..*\)$;\1%{V_comp}\2;'` + done ) + ( cd $RPM_BUILD_ROOT%{l_prefix}/man/man1 + for file in *; do + mv ${file} `echo ${file} | sed -e 's;^\([^.]*\)\(\..*\)$;\1%{V_comp}\2;'` + done ) +%endif + + # determine installation file list + %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} + +%files -f files + +%clean + rm -rf $RPM_BUILD_ROOT + @@ . patch -p0 <<'@@ .' Index: openpkg-web/news.txt ============================================================================ $ cvs diff -u -r1.5444 -r1.5445 news.txt --- openpkg-web/news.txt 8 Jul 2003 13:17:52 -0000 1.5444 +++ openpkg-web/news.txt 8 Jul 2003 13:41:48 -0000 1.5445 @@ -1,3 +1,4 @@ +08-Jul-2003: New package: P<gcc34-3.4s20030702-20030708> 08-Jul-2003: Upgraded package: P<openvpn-1.4.1-20030708> 08-Jul-2003: Upgraded package: P<dhcp-agent-0.40-20030708> 08-Jul-2003: Upgraded package: P<axyftp-0.5.1-20030708> @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]