summaryrefslogtreecommitdiffstats
path: root/testsuites/libtests
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2017-12-23 18:18:56 +1100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2018-01-25 08:45:26 +0100
commit2afb22b7e1ebcbe40373ff7e0efae7d207c655a9 (patch)
tree44759efe9374f13200a97e96d91bd9a2b7e5ce2a /testsuites/libtests
parentMAINTAINERS: Add myself to Write After Approval. (diff)
downloadrtems-2afb22b7e1ebcbe40373ff7e0efae7d207c655a9.tar.bz2
Remove make preinstall
A speciality of the RTEMS build system was the make preinstall step. It copied header files from arbitrary locations into the build tree. The header files were included via the -Bsome/build/tree/path GCC command line option. This has at least seven problems: * The make preinstall step itself needs time and disk space. * Errors in header files show up in the build tree copy. This makes it hard for editors to open the right file to fix the error. * There is no clear relationship between source and build tree header files. This makes an audit of the build process difficult. * The visibility of all header files in the build tree makes it difficult to enforce API barriers. For example it is discouraged to use BSP-specifics in the cpukit. * An introduction of a new build system is difficult. * Include paths specified by the -B option are system headers. This may suppress warnings. * The parallel build had sporadic failures on some hosts. This patch removes the make preinstall step. All installed header files are moved to dedicated include directories in the source tree. Let @RTEMS_CPU@ be the target architecture, e.g. arm, powerpc, sparc, etc. Let @RTEMS_BSP_FAMILIY@ be a BSP family base directory, e.g. erc32, imx, qoriq, etc. The new cpukit include directories are: * cpukit/include * cpukit/score/cpu/@RTEMS_CPU@/include * cpukit/libnetworking The new BSP include directories are: * bsps/include * bsps/@RTEMS_CPU@/include * bsps/@RTEMS_CPU@/@RTEMS_BSP_FAMILIY@/include There are build tree include directories for generated files. The include directory order favours the most general header file, e.g. it is not possible to override general header files via the include path order. The "bootstrap -p" option was removed. The new "bootstrap -H" option should be used to regenerate the "headers.am" files. Update #3254.
Diffstat (limited to 'testsuites/libtests')
-rw-r--r--testsuites/libtests/POSIX/Makefile.am2
-rw-r--r--testsuites/libtests/configure.ac2
-rw-r--r--testsuites/libtests/ftp01/Makefile.am2
-rw-r--r--testsuites/libtests/mghttpd01/Makefile.am1
-rw-r--r--testsuites/libtests/networking01/Makefile.am2
-rw-r--r--testsuites/libtests/syscall01/Makefile.am1
6 files changed, 7 insertions, 3 deletions
diff --git a/testsuites/libtests/POSIX/Makefile.am b/testsuites/libtests/POSIX/Makefile.am
index 1f806513cf..689fd391e6 100644
--- a/testsuites/libtests/POSIX/Makefile.am
+++ b/testsuites/libtests/POSIX/Makefile.am
@@ -1,4 +1,4 @@
-CC = @CC@ $(GCCSPECS)
+CC = @CC@
check_PROGRAMS =
diff --git a/testsuites/libtests/configure.ac b/testsuites/libtests/configure.ac
index 16cc095991..dc4602cbb2 100644
--- a/testsuites/libtests/configure.ac
+++ b/testsuites/libtests/configure.ac
@@ -5,6 +5,8 @@ AC_INIT([rtems-c-src-tests-libtests],[_RTEMS_VERSION],[https://devel.rtems.org/n
AC_CONFIG_SRCDIR([cpuuse])
AC_CONFIG_HEADER([config.h])
RTEMS_TOP([../..],[..])
+RTEMS_SOURCE_TOP
+RTEMS_BUILD_TOP
RTEMS_CANONICAL_TARGET_CPU
diff --git a/testsuites/libtests/ftp01/Makefile.am b/testsuites/libtests/ftp01/Makefile.am
index a3b8f3e2b4..4a0fd4efe6 100644
--- a/testsuites/libtests/ftp01/Makefile.am
+++ b/testsuites/libtests/ftp01/Makefile.am
@@ -11,7 +11,7 @@ include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/termios04
+AM_CPPFLAGS += -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking
LINK_OBJS = $(ftp01_OBJECTS) $(ftp01_LDADD)
LINK_LIBS = $(ftp01_LDLIBS)
diff --git a/testsuites/libtests/mghttpd01/Makefile.am b/testsuites/libtests/mghttpd01/Makefile.am
index 909a646970..d3c89d86ca 100644
--- a/testsuites/libtests/mghttpd01/Makefile.am
+++ b/testsuites/libtests/mghttpd01/Makefile.am
@@ -12,6 +12,7 @@ include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+AM_CPPFLAGS += -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking
LINK_OBJS = $(mghttpd01_OBJECTS) $(mghttpd01_LDADD)
LINK_LIBS = $(mghttpd01_LDLIBS)
diff --git a/testsuites/libtests/networking01/Makefile.am b/testsuites/libtests/networking01/Makefile.am
index 0f1fb70bd3..3bc93cebd7 100644
--- a/testsuites/libtests/networking01/Makefile.am
+++ b/testsuites/libtests/networking01/Makefile.am
@@ -10,7 +10,7 @@ include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/termios04
+AM_CPPFLAGS += -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking
LINK_OBJS = $(networking01_OBJECTS)
LINK_LIBS = $(networking01_LDLIBS)
diff --git a/testsuites/libtests/syscall01/Makefile.am b/testsuites/libtests/syscall01/Makefile.am
index 126cd30aa7..6d8038e20b 100644
--- a/testsuites/libtests/syscall01/Makefile.am
+++ b/testsuites/libtests/syscall01/Makefile.am
@@ -8,6 +8,7 @@ include $(top_srcdir)/../automake/compile.am
include $(top_srcdir)/../automake/leaf.am
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+AM_CPPFLAGS += -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking
LINK_OBJS = $(syscall01_OBJECTS)
LINK_LIBS = $(syscall01_LDLIBS)