Misc. backports from rtems-4.8

This commit is contained in:
Ralf Corsepius
2007-02-17 06:56:06 +00:00
parent 9b6ba91a44
commit 5870da5e69
3 changed files with 10 additions and 1 deletions

View File

@@ -4,7 +4,7 @@
EXTRA_DIST = EXTRA_DIST =
SUBDIRS = @TARGET_SUBDIRS@ SUBDIRS = @HOST_SUBDIRS@ @TARGET_SUBDIRS@
DIST_SUBDIRS = cygwin DIST_SUBDIRS = cygwin
DIST_SUBDIRS += freebsd5.2 DIST_SUBDIRS += freebsd5.2

View File

@@ -62,25 +62,31 @@ case "$prefix" in
/usr) /usr)
sysdirpattern="/%sysdir/d" sysdirpattern="/%sysdir/d"
rpmprefix= rpmprefix=
host_subdirs=
;; ;;
/usr/local) /usr/local)
sysdirpattern="/%sysdir/d" sysdirpattern="/%sysdir/d"
rpmprefix="local-" rpmprefix="local-"
host_subdirs=autotools
;; ;;
/opt/rtems) /opt/rtems)
sysdirpattern="s/^%sysdir/%dir/g" sysdirpattern="s/^%sysdir/%dir/g"
rpmprefix="rtems-" rpmprefix="rtems-"
host_subdirs=autotools
;; ;;
NONE|${ac_default_prefix}) # Default prefix NONE|${ac_default_prefix}) # Default prefix
sysdirpattern="s/^%sysdir/%dir/g" sysdirpattern="s/^%sysdir/%dir/g"
rpmprefix="[rtems-]RTEMS_API[-]" rpmprefix="[rtems-]RTEMS_API[-]"
host_subdirs=autotools
;; ;;
*) *)
sysdirpattern="s/^%sysdir/%dir/g" sysdirpattern="s/^%sysdir/%dir/g"
rpmprefix="custom-" rpmprefix="custom-"
host_subdirs=autotools
;; ;;
esac esac
AC_SUBST(sysdirpattern) AC_SUBST(sysdirpattern)
AC_SUBST(HOST_SUBDIRS,$host_subdirs)
AC_ARG_ENABLE([rpmprefix], AC_ARG_ENABLE([rpmprefix],
[ --enable-rpmprefix=<rpmprefix> prefix rpms],[ [ --enable-rpmprefix=<rpmprefix> prefix rpms],[

View File

@@ -20,6 +20,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%define _use_internal_dependency_generator 0 %define _use_internal_dependency_generator 0
%if "%{gcc_version}" >= "4.2.0"
BuildRequires: flex bison
%endif
%if %build_gcj %if %build_gcj
# Building gcj requires bison and zlib # Building gcj requires bison and zlib
BuildRequires: bison BuildRequires: bison