diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2007-02-17 06:56:06 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2007-02-17 06:56:06 +0000 |
| commit | 5870da5e696f9977df50533b121c95aa8fcc1018 (patch) | |
| tree | e90a1de01fb603086d8023eafb3de541d7c3a238 | |
| parent | Add ||: to install-info. (diff) | |
| download | rtems-5870da5e696f9977df50533b121c95aa8fcc1018.tar.bz2 | |
Misc. backports from rtems-4.8
| -rw-r--r-- | contrib/crossrpms/Makefile.am | 2 | ||||
| -rw-r--r-- | contrib/crossrpms/configure.ac | 6 | ||||
| -rw-r--r-- | contrib/crossrpms/gcc/gccnewlib.add | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/contrib/crossrpms/Makefile.am b/contrib/crossrpms/Makefile.am index 715a9dc80f..a358e91300 100644 --- a/contrib/crossrpms/Makefile.am +++ b/contrib/crossrpms/Makefile.am @@ -4,7 +4,7 @@ EXTRA_DIST = -SUBDIRS = @TARGET_SUBDIRS@ +SUBDIRS = @HOST_SUBDIRS@ @TARGET_SUBDIRS@ DIST_SUBDIRS = cygwin DIST_SUBDIRS += freebsd5.2 diff --git a/contrib/crossrpms/configure.ac b/contrib/crossrpms/configure.ac index 339b2cb1e8..7d3dd2be21 100644 --- a/contrib/crossrpms/configure.ac +++ b/contrib/crossrpms/configure.ac @@ -62,25 +62,31 @@ case "$prefix" in /usr) sysdirpattern="/%sysdir/d" rpmprefix= + host_subdirs= ;; /usr/local) sysdirpattern="/%sysdir/d" rpmprefix="local-" + host_subdirs=autotools ;; /opt/rtems) sysdirpattern="s/^%sysdir/%dir/g" rpmprefix="rtems-" + host_subdirs=autotools ;; NONE|${ac_default_prefix}) # Default prefix sysdirpattern="s/^%sysdir/%dir/g" rpmprefix="[rtems-]RTEMS_API[-]" + host_subdirs=autotools ;; *) sysdirpattern="s/^%sysdir/%dir/g" rpmprefix="custom-" + host_subdirs=autotools ;; esac AC_SUBST(sysdirpattern) +AC_SUBST(HOST_SUBDIRS,$host_subdirs) AC_ARG_ENABLE([rpmprefix], [ --enable-rpmprefix=<rpmprefix> prefix rpms],[ diff --git a/contrib/crossrpms/gcc/gccnewlib.add b/contrib/crossrpms/gcc/gccnewlib.add index aaad153440..00e6f07a71 100644 --- a/contrib/crossrpms/gcc/gccnewlib.add +++ b/contrib/crossrpms/gcc/gccnewlib.add @@ -20,6 +20,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %define _use_internal_dependency_generator 0 +%if "%{gcc_version}" >= "4.2.0" +BuildRequires: flex bison +%endif %if %build_gcj # Building gcj requires bison and zlib BuildRequires: bison |