diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-08-12 18:22:17 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-08-12 18:22:17 +0000 |
| commit | ea562ee977d4b48500a9b117e543e9c4ae0eb05e (patch) | |
| tree | eece22c6292c13b788f7baafc4da8471283c0ff2 /c/src/make/custom | |
| parent | Patch from Tony R. Ambardar <tonya@ece.ubc.ca>: (diff) | |
| download | rtems-ea562ee977d4b48500a9b117e543e9c4ae0eb05e.tar.bz2 | |
Patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:
After upgrading my linux box to the brand new SuSE 6.2 release, which is
glibc-2.1 based, I came across a bug in RTEMS - IIRC, I even warned you
about it about 1/2 a year ago, but nothing has been done since then :-.
The *.m4 macros to check for SYSV/IPC are broken for linux/glibc2.1,
because they assume that linux always defines union semun, which isn't
true anymore for glibc2.1 (the manpage for semctl states _X_OPEN
specifies it this way). Therefore I have tried to implement a more
general approach for handling SYSV for unix/posix which checks for
presence of struct semun, instead of trying to evaluate OS specific
preprocessor symbols.
This approach is a bit adventureous, because I only tested it with
linux/glibc2.1 and linux/libc5, but not under other Unix variants RTEMS
supports. I am quite confident it will work on other hosts, too, but who
knows :-.
[FYI: I think this might also is the cause of some problems with RedHat
6.X / Mandrake linux recently reported on the rtems list -- rtems-4.0.0
can not be build for posix on any glibc2.1 based host]
Furthermore the patch below contains a couple of minor fixes and
configuration cleanups, which IMO should be applied before releasing a
new snapshot.
To apply this patch:
cd <source-tree>
patch -p1 < rtems-rc-19990709-8.diff
./autogen
Diffstat (limited to '')
| -rw-r--r-- | c/src/make/custom/Makefile.am | 7 | ||||
| -rw-r--r-- | c/src/make/custom/Makefile.in | 5 | ||||
| -rw-r--r-- | c/src/make/custom/default.cfg.in | 3 |
3 files changed, 2 insertions, 13 deletions
diff --git a/c/src/make/custom/Makefile.am b/c/src/make/custom/Makefile.am index 5cd10d1d8b..a36fba661f 100644 --- a/c/src/make/custom/Makefile.am +++ b/c/src/make/custom/Makefile.am @@ -11,11 +11,4 @@ rtems_make_custom_DATA = @CUSTOM_CFG_FILES@ noinst_DATA = \ default.cfg -if MAINTAINER_MODE -$(srcdir)/default.cfg.in: $(top_srcdir)/@RTEMS_TOPdir@/make/custom/default.cfg - sed -e 's%\$$(RTEMS_BSP)%\@RTEMS_BSP\@%g' \ - -e 's%\$$(RTEMS_ROOT)/\@RTEMS_BSP\@%$$(RTEMS_ROOT)%g' \ - < $< >$@ -endif - include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/make/custom/Makefile.in b/c/src/make/custom/Makefile.in index 1ba4c11d09..84a6c932f0 100644 --- a/c/src/make/custom/Makefile.in +++ b/c/src/make/custom/Makefile.in @@ -260,11 +260,6 @@ installdirs mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean -@MAINTAINER_MODE_TRUE@$(srcdir)/default.cfg.in: $(top_srcdir)/@RTEMS_TOPdir@/make/custom/default.cfg -@MAINTAINER_MODE_TRUE@ sed -e 's%\$$(RTEMS_BSP)%\@RTEMS_BSP\@%g' \ -@MAINTAINER_MODE_TRUE@ -e 's%\$$(RTEMS_ROOT)/\@RTEMS_BSP\@%$$(RTEMS_ROOT)%g' \ -@MAINTAINER_MODE_TRUE@ < $< >$@ - debug-am: debug: debug-am .PHONY: debug debug-am diff --git a/c/src/make/custom/default.cfg.in b/c/src/make/custom/default.cfg.in index 0ec951c199..8bcc453475 100644 --- a/c/src/make/custom/default.cfg.in +++ b/c/src/make/custom/default.cfg.in @@ -30,9 +30,10 @@ INLINE=inline INLINE_UPCASE=INLINE endif +# OBSOLETE: Not used inside the source tree anymore # HOST Compiler config file # You may also want to specify where the compiler resides here. -CONFIG.$(HOST_ARCH).CC = $(PROJECT_ROOT)/make/compilers/gcc.cfg +# CONFIG.$(HOST_ARCH).CC = $(PROJECT_ROOT)/make/compilers/gcc.cfg ## Target compiler config file, if any CONFIG.$(TARGET_ARCH).CC = $(RTEMS_ROOT)/make/compilers/gcc-target-default.cfg |