diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2010-03-21 06:21:41 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2010-03-21 06:21:41 +0000 |
| commit | 4196a53d12001656c3e77f6513a1a75ba3fed7b6 (patch) | |
| tree | 98d6f745425382682660563739e5e0be02014902 /contrib | |
| parent | Use patch -p1 instead of patch -p0 for gcc patches. (diff) | |
| download | rtems-4196a53d12001656c3e77f6513a1a75ba3fed7b6.tar.bz2 | |
Add with_pygdb.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/crossrpms/gcc/gccnewlib.add | 2 | ||||
| -rw-r--r-- | contrib/crossrpms/gcc/install.add | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/contrib/crossrpms/gcc/gccnewlib.add b/contrib/crossrpms/gcc/gccnewlib.add index 1721cf2d9a..d8653e10b2 100644 --- a/contrib/crossrpms/gcc/gccnewlib.add +++ b/contrib/crossrpms/gcc/gccnewlib.add @@ -24,6 +24,8 @@ BuildRequires: %{_host_rpmprefix}gcc %bcond_with lto +%bcond_with pygdb + # versions of libraries, we conditionally bundle if necessary %global mpc_version 0.8.1 %global mpfr_version 2.4.1 diff --git a/contrib/crossrpms/gcc/install.add b/contrib/crossrpms/gcc/install.add index 4030961786..e7d93529ec 100644 --- a/contrib/crossrpms/gcc/install.add +++ b/contrib/crossrpms/gcc/install.add @@ -66,6 +66,13 @@ rmdir ${RPM_BUILD_ROOT}%{_prefix}/@tool_target@/include/bits fi + # gcc >= 4.5.0: installs weird libstdc++ python bindings. +%if ! %{with pygdb} + if test -d ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python; then + rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gcc-%{gcc_version}/python/libstdcxx + fi +%endif + # Collect multilib subdirectories multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` @@ -123,6 +130,7 @@ *jc1) ;; *jvgenmain) ;; */libgfortran*.*) echo "$i" >> build/files.gfortran ;; + %{!?with_pygdb:*/libstdc++*gdb.py*) rm ${RPM_BUILD_ROOT}/$i ;;} # ignore for now */libstdc++.*) echo "$i" >> build/files.g++ ;; */libsupc++.*) echo "$i" >> build/files.g++ ;; *) echo "$i" >> build/files.gcc ;; |