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 Date: 08-Feb-2003 16:29:54 Branch: HEAD Handle: 2003020815295201 Modified files: openpkg-src/gcc33 gcc33.spec openpkg-web news.txt Log: Work off also this gcc snapshot package according to the gcc.spec from the already worked off "gcc" package. Summary: Revision Changes Path 1.15 +85 -102 openpkg-src/gcc33/gcc33.spec 1.3237 +1 -0 openpkg-web/news.txt ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/gcc33/gcc33.spec ============================================================================ $ cvs diff -u -r1.14 -r1.15 gcc33.spec --- openpkg-src/gcc33/gcc33.spec 3 Feb 2003 20:29:55 -0000 1.14 +++ openpkg-src/gcc33/gcc33.spec 8 Feb 2003 15:29:53 -0000 1.15 @@ -24,10 +24,10 @@ ## # package versions -%define V_major 3.3 -%define V_short 33 -%define V_snap_comp 20030203 +%define V_major_dot 3.3 +%define V_major_comp 33 %define V_snap_dash 2003-02-03 +%define V_snap_comp 20030203 # package information Name: gcc33 @@ -38,8 +38,8 @@ Distribution: OpenPKG [EVAL] Group: Language License: GPL -Version: %{V_major}s%{V_snap_comp} -Release: 20030203 +Version: %{V_major_dot}s%{V_snap_comp} +Release: 20030208 # package options %option with_cxx yes @@ -75,156 +75,139 @@ gcc/configure %build - # configure the package + # create build sub-directory mkdir obj cd obj - options="" + + # 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* ) options="--with-gnu-as --with-gnu-ld" ;; + *-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 \ - --with-gxx-include-dir=%{l_prefix}/include/g++%{V_short} \ - --with-local-prefix=%{l_prefix}/lib/gcc%{V_short}-lib \ -%if "%{with_cxx}" == "yes" - --enable-languages="c,c++" \ -%else - --enable-languages="c" \ -%endif -%if "%{with_threads}" == "yes" - --enable-threads=posix \ -%else - --enable-threads=single \ -%endif + --includedir=%{l_prefix}/include/gcc%{V_major_comp} \ + --with-gxx-include-dir=%{l_prefix}/include/g++%{V_major_comp} \ + --with-local-prefix=%{l_prefix}/lib/gcc%{V_major_comp}-lib \ + --enable-languages="${l_enable_languages}" \ + --enable-threads="${l_enable_threads}" \ --disable-maintainer-mode \ --disable-shared \ --disable-nls \ -%if "%{with_binutils}" == "yes" - --with-gnu-ld --with-ld=%{l_prefix}/bin/ld \ - --with-gnu-as --with-as=%{l_prefix}/bin/as \ -%endif - $options + ${l_with_gnu_ld_as} - # redirect lib directory + # explicitly redirect remaining gcc-lib directories %{l_shtool} subst -v -s \ - -e "s;/gcc-lib/;/gcc%{V_short}-lib/;" \ + -e "s;/gcc-lib/;/gcc%{V_major_comp}-lib/;" \ `find . -name Makefile -type f -print` - # build the package + # determine build parameters %if "%{with_optimize}" == "yes" l_boot_cflags="-O2" l_cflags="-O" l_libcflags="-g -O2" l_libcxxflags="-g -O2 -fno-implicit-templates" - case "%{l_target}" in - *-osf* ) l_boot_cflags="-O" ;; - esac %else l_boot_cflags="-O0" l_cflags="" l_libcflags="-g -O0" l_libcxxflags="-g -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" \ + BOOT_CFLAGS="${l_boot_cflags}" \ + CFLAGS="${l_cflags}" \ + LIBCFLAGS="${l_libcflags}" \ + LIBCXXFLAGS="${l_libcxxflags}" \ bootstrap-lean %install rm -rf $RPM_BUILD_ROOT - triple=`./config.guess` - cd obj - - # redirect to temporary build root - %{l_shtool} subst -v -s \ - -e "s;^\\(prefix[ ]*=\\).*;\\1 $RPM_BUILD_ROOT%{l_prefix};" \ - -e "s;^\\(exec_prefix[ ]*=\\).*;\\1 $RPM_BUILD_ROOT%{l_prefix};" \ - -e "s;^\\(gcc_gxx_include_dir[ ]*=\\).*;\\1 $RPM_BUILD_ROOT%{l_prefix}/include/g++%{V_short};" \ - -e "s;^\\(gxx_include_dir[ ]*=\\).*;\\1 $RPM_BUILD_ROOT%{l_prefix}/include/g++%{V_short};" \ - -e "s;^\\(glibcppinstalldir[ ]*=\\).*;\\1 $RPM_BUILD_ROOT%{l_prefix}/include/g++%{V_short};" \ - -e "s;^\\(local_prefix[ ]*=\\).*;\\1 $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_short}-lib;" \ - -e "s;^\\(includedir[ ]*=\\).*;\\1 $RPM_BUILD_ROOT%{l_prefix}/include/gcc;" \ - -e "s;/gcc-lib/;/gcc%{V_short}-lib;" \ - `find . -name Makefile -type f -print` - - # make sure the install procedure doesn't compile anything - # (or else we would have wrong paths hard-coded in the programs) - %{l_shtool} subst -v -s \ - -e 's;^install-cpp:.*;install-cpp:;' \ - -e 's;^install-common:.*;install-common: installdirs lang.install-common;' \ - -e 's;^install-driver:.*;install-driver:;' \ - -e 's;^install-libgcc:.*;install-libgcc: installdirs;' \ - -e 's;^install-build:.*;install-build:;' \ - -e 's;^install-collect2:.*;install-collect2: installdirs;' \ - -e 's;^install-assert-h:.*;install-assert-h: installdirs;' \ - -e 's;^install: stmp-dirs ./libgcc.a;install: stmp-dirs;' \ - -e 's;^\(install-.*:.*\) all *\(.*\)$;\1\2;' \ - gcc/Makefile gcc/libgcc.mk gcc/*/Makefile - - # make sure the Makefiles are not re-generated - for file in `find . -name config.status -print`; do - ( echo "#!/bin/sh" - echo ":" - ) >$file - done - # run the standard installation procedure - %{l_make} %{l_mflags} install + # fetch GNU platform triple + triple=`./config.guess` + triple=`./config.sub ${triple}` - # strip the installation - mv $RPM_BUILD_ROOT%{l_prefix}/$triple/include/* \ - $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_short}-lib/$triple/%{V_major}/include/ >/dev/null 2>&1 || true - rm -rf $RPM_BUILD_ROOT%{l_prefix}/$triple - rm -rf $RPM_BUILD_ROOT%{l_prefix}/man/man7 + # 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_major_comp}-lib/${triple}/%{V_major_dot}/ + mv $RPM_BUILD_ROOT%{l_prefix}/${triple}/include/* \ + $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_major_comp}-lib/${triple}/%{V_major_dot}/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/gccbug >/dev/null 2>&1 || true rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/*-gcc >/dev/null 2>&1 || true - rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/*-gcc-%{V_major} >/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_short}-lib/$triple/%{V_major}/$prog >/dev/null 2>&1 || true + strip $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_major_comp}-lib/${triple}/%{V_major_dot}/${prog} \ + >/dev/null 2>&1 || true done - # cleanup tree - rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/gcc-lib - rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/libiberty.a - rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_short}-lib/$triple/%{V_major}/libstdc++.a - mv $RPM_BUILD_ROOT%{l_prefix}/lib/libstdc++.a* \ - $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_short}-lib/$triple/%{V_major}/libstdc++.a - rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_short}-lib/$triple/%{V_major}/libsupc++.a - mv $RPM_BUILD_ROOT%{l_prefix}/lib/libsupc++.a* \ - $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_short}-lib/$triple/%{V_major}/libsupc++.a + # 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 - # rename files + # resolve filename conflicts ( cd $RPM_BUILD_ROOT%{l_prefix}/bin for file in *; do - mv ${file} ${file}%{V_short} - done - ) + mv ${file} ${file}%{V_major_comp} + done ) ( cd $RPM_BUILD_ROOT%{l_prefix}/info for file in *; do - mv ${file} `echo ${file} | sed -e 's;^\([^.]*\)\(\..*\)$;\1%{V_short}\2;'` - done - ) + mv ${file} `echo ${file} | sed -e 's;^\([^.]*\)\(\..*\)$;\1%{V_major_comp}\2;'` + done ) ( cd $RPM_BUILD_ROOT%{l_prefix}/man/man1 for file in *; do - mv ${file} `echo ${file} | sed -e 's;^\([^.]*\)\(\..*\)$;\1%{V_short}\2;'` - done - ) + mv ${file} `echo ${file} | sed -e 's;^\([^.]*\)\(\..*\)$;\1%{V_major_comp}\2;'` + done ) - # create file list - %{l_rpmtool} files -v -o$RPM_BUILD_DIR/gcc-%{V_snap_comp}/files -r$RPM_BUILD_ROOT %{l_files_std} + # determine installation file list + %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} %files -f files @@ . patch -p0 <<'@@ .' Index: openpkg-web/news.txt ============================================================================ $ cvs diff -u -r1.3236 -r1.3237 news.txt --- openpkg-web/news.txt 8 Feb 2003 13:45:07 -0000 1.3236 +++ openpkg-web/news.txt 8 Feb 2003 15:29:52 -0000 1.3237 @@ -1,3 +1,4 @@ +08-Feb-2003: Upgraded package: P<gcc33-3.3s20030203-20030208> 08-Feb-2003: Upgraded package: P<gcc-3.2.2-20030208> 08-Feb-2003: New package: P<pnetlib-0.5.2-20030208> 08-Feb-2003: Upgraded package: P<xalan-c-1.4-20030208> @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]