From de102fc8e989a9c2ef049ff6012c1199fab69c41 Mon Sep 17 00:00:00 2001 From: Tushar Teredesai Date: Fri, 4 Apr 2003 00:07:27 +0000 Subject: [PATCH] merged gnat and gcc git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@801 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- general/general.ent | 2 +- general/prog/gcc.xml | 3 +- general/prog/gcc/gcc-desc.xml | 75 ++++++++++++++++++++++++++++-- general/prog/gcc/gcc-exp.xml | 24 ++++------ general/prog/gcc/gcc-inst.xml | 22 ++++----- general/prog/gcc/gcc-inst1.xml | 17 ------- general/prog/gcc/gnat-inst.xml | 29 ++++++++++++ general/prog/gcc/gnat-intro.xml | 19 ++++++++ general/prog/gcc/gnat.ent | 8 ++++ general/prog/gnat.xml | 11 ----- general/prog/prog.xml | 1 - index.xml | 4 +- introduction/welcome/changelog.xml | 3 ++ introduction/welcome/credits.xml | 6 +-- 14 files changed, 159 insertions(+), 65 deletions(-) delete mode 100644 general/prog/gcc/gcc-inst1.xml create mode 100644 general/prog/gcc/gnat-inst.xml create mode 100644 general/prog/gcc/gnat-intro.xml create mode 100644 general/prog/gcc/gnat.ent delete mode 100644 general/prog/gnat.xml diff --git a/general/general.ent b/general/general.ent index 2f88762fc2..cd2df3c0a4 100644 --- a/general/general.ent +++ b/general/general.ent @@ -91,8 +91,8 @@ - + %python; %perl-modules; diff --git a/general/prog/gcc.xml b/general/prog/gcc.xml index 4899ef23e8..4b7ae8f152 100644 --- a/general/prog/gcc.xml +++ b/general/prog/gcc.xml @@ -2,10 +2,11 @@ gcc-&gcc-version; +&gnat-intro; +&gnat-inst; &gcc-intro; &gcc-inst; &gcc-exp; -&gcc-inst1; &gcc-desc; diff --git a/general/prog/gcc/gcc-desc.xml b/general/prog/gcc/gcc-desc.xml index 3e95ec48de..c271ad140e 100644 --- a/general/prog/gcc/gcc-desc.xml +++ b/general/prog/gcc/gcc-desc.xml @@ -18,13 +18,82 @@ Description -These programs and libraries have been documented on the -LFS gcc-&gcc-version; page and at except -for: +The programs and libraries whose descriptions are missing here +have been described in the LFS gcc-&gcc-version; page. g77 g77 is the fortran compiler invoked by gcc. +add2line +add2line converts the ASCII form of the 2-line orbital elements in +a file to binary form and appends them to the orbdata files. + +gcov +gcov is a test coverage program. + +gdb +gdb is the GNAT debugger. + +gnatbind +gnatbind is used to bind compiled objects. + +gnatbl +gnatbl is the Ada linker. + +gnatchop +gnatchop is useful for renaming files to meet the standard Ada +default file naming conventions. + +gnatelim +gnatelim is used to detect and eliminate unused subprograms in an +Ada partition. + +gnatfind +gnatfind is the GNAT definition/use finder. + +gnatgcc +gnatgcc is the compiler. + +gnathtml.pl +gnathtml.pl converts Ada souce files to html for viewing in Web +browsers. + +gnatkr +gnatkr is used to determine the crunched name for a given file, +when crunched to a specified maximum length. + +gnatlink +gnatlink is used to link programs and build an executable file. + +gnatls +gnatls is the compiled unit browser. + +gnatemake +gnatmake ia an automatic make facility. + +gnatmem +gnatmem is the GNAT utility that monitors dynamic allocation and +deallocation activity in a program. + +gnatprep +gnatprep is the GNAT external preprocessor. + +gnatpsta +gnatpsta determines the values of all the relevant parameters in +Standard and outputs to stdout. + +gnatpsys +gnatpsys determines the values of all the relevant parameters in +System and outputs to stdout. + +gnatstub +gnatstub is a generator of body stubs. + +gnatxref +gnatxref is the GNAT cross referencer. + +gvd +gvd is the GNU Visual Debugger. diff --git a/general/prog/gcc/gcc-exp.xml b/general/prog/gcc/gcc-exp.xml index 8d1d4c9e00..2f33e13a81 100644 --- a/general/prog/gcc/gcc-exp.xml +++ b/general/prog/gcc/gcc-exp.xml @@ -1,36 +1,32 @@ Command explanations -export CC=cc : This command allows you to -use gcc's C compiler instead of gnat's C compiler. - -export PATH_HOLD=$PATH : This command +PATH_HOLD=$PATH : This command stores your current path before it's modified so that it can be restored after installation. -export PATH=/usr/src/gnat/bin:$PATH : This +export PATH=$PATH:/opt/gnat/bin : This command allows the build to find gnat's Ada compiler to build Ada. +touch treeprs.ads [es]info.h nmake.ad[bs] : +This command creates necessary files for the Ada build. This step +may be skipped if you don't want to compile the ada frontend. + --enable-languages=c,c++,objc,f77,ada,java -: This command builds all available languages in the gcc package except -java. You can modify this command to remove unwanted languages. If you -are removing Ada, use the separate installation instructions below. +: This command builds all available languages in the gcc package. +You may modify this command to remove unwanted languages. --enable-shared --enable-threads=posix --enable-__cxa_atexit : These commands are required to build the C++ libraries to published standards. ---with-slibdir=/lib : This command sets the path to -libgcc_s.so. - --enable-clocale=gnu : This command is a failsafe for incomplete localedata. -touch treeprs.ads [es]info.h nmake.ad[bs] : This command creates necessary files for the Ada build. - make gnatlib_and tools : This command -completes the Ada build process. +completes the Ada build process. Skip this step if you have not enabled +ADA as one of the languages. diff --git a/general/prog/gcc/gcc-inst.xml b/general/prog/gcc/gcc-inst.xml index 23ed8efb52..853ff008a3 100644 --- a/general/prog/gcc/gcc-inst.xml +++ b/general/prog/gcc/gcc-inst.xml @@ -3,25 +3,23 @@ Install gcc by running the following commands: -export CC=cc && -unset CFLAGS -unset CXXFLAGS -export PATH_HOLD=$PATH && -export PATH=/usr/src/gnat/bin:$PATH && +PATH_HOLD=$PATH && +export PATH=$PATH:/opt/gnat/bin && +cd gcc/ada && +touch treeprs.ads [es]info.h nmake.ad[bs] && +cd ../.. && mkdir ../gcc-build && cd ../gcc-build && ../gcc-&gcc-version;/configure --prefix=/usr --enable-shared \ --enable-languages=c,c++,objc,f77,ada,java --enable-threads=posix \ ---with-slibdir=/lib --enable-__cxa_atexit --enable-clocale=gnu && -cd ../gcc-&gcc-version;/gcc/ada && -touch treeprs.ads [es]info.h nmake.ad[bs] && -cd /usr/src/gcc-build && +--enable-__cxa_atexit --enable-clocale=gnu && make bootstrap && -cd gcc && -make gnatlib_and_tools && -cd .. && +make -C gcc gnatlib_and_tools && make install-no-fixedincludes && export PATH=$PATH_HOLD +You may remove the gnat installation: +rm -rf /opt/gnat + diff --git a/general/prog/gcc/gcc-inst1.xml b/general/prog/gcc/gcc-inst1.xml deleted file mode 100644 index cd752b17f7..0000000000 --- a/general/prog/gcc/gcc-inst1.xml +++ /dev/null @@ -1,17 +0,0 @@ - -Installation of gcc without Ada - -Install gcc by running the following commands: - -unset CFLAGS -unset CXXFLAGS -mkdir ../gcc-build && -cd ../gcc-build && -../gcc-&gcc-version;/configure --prefix=/usr --enable-shared \ ---enable-languages=c,c++,objc,f77,java --enable-threads=posix \ ---with-slibdir=/lib --enable-__cxa_atexit --enable-clocale=gnu && -make bootstrap && -make install-no-fixedincludes - - - diff --git a/general/prog/gcc/gnat-inst.xml b/general/prog/gcc/gnat-inst.xml new file mode 100644 index 0000000000..da5a70327a --- /dev/null +++ b/general/prog/gcc/gnat-inst.xml @@ -0,0 +1,29 @@ + +Installation of gnat + +Install gnat by running the following commands: + +./doconfig + +The above script will ask you how and where you would like to install +gnat. To avoid conflicts with the system gcc, the package will be installed +in a seperate directory, that can later be removed from the system. + +In response to the questions asked by the doconfig script, enter +3 in response to the first question +and /opt/gnat in response to the +second question. + +To finish the install, run +./doinstall + +The gnat compiler can be invoked by executing the gcc binary +installed by the above script. To avoid conflicts with the system +gcc, we will rename the gcc command. +mv /opt/gnat/bin && +mv gcc gnatgcc && +cd real && +mv gcc gnatgcc + + + diff --git a/general/prog/gcc/gnat-intro.xml b/general/prog/gcc/gnat-intro.xml new file mode 100644 index 0000000000..a9f3dad719 --- /dev/null +++ b/general/prog/gcc/gnat-intro.xml @@ -0,0 +1,19 @@ + +Introduction to gnat (binary version) + +Download location (FTP): +Version used: &gnat-version; +Package size: &gnat-size; +Estimated Disk space required: &gnat-buildsize; + +The gnat package contains a precompiled Ada compiler. +This package is used to satisfy the circular +dependency when you recompile gcc to include ada. + +You may skip installation of gnat if you do not want to recompile gcc +with ada support. + +gnat depends on: + + + diff --git a/general/prog/gcc/gnat.ent b/general/prog/gcc/gnat.ent new file mode 100644 index 0000000000..6e2f396588 --- /dev/null +++ b/general/prog/gcc/gnat.ent @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/general/prog/gnat.xml b/general/prog/gnat.xml deleted file mode 100644 index 6a293340c2..0000000000 --- a/general/prog/gnat.xml +++ /dev/null @@ -1,11 +0,0 @@ - - -gnat-&gnat-version; - -&gnat-intro; -&gnat-inst; -&gnat-config; -&gnat-desc; - - - diff --git a/general/prog/prog.xml b/general/prog/prog.xml index 079236b498..f3146d3623 100644 --- a/general/prog/prog.xml +++ b/general/prog/prog.xml @@ -7,7 +7,6 @@ &librep; &j2sdk; &ruby; -&gnat; &gcc; &gcc2; diff --git a/index.xml b/index.xml index c55153e36e..5507cfdfe8 100644 --- a/index.xml +++ b/index.xml @@ -2,8 +2,8 @@ - + + diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index 6b333f4415..fe645beaa8 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -10,6 +10,9 @@ page in Chapter 1 for details on who wrote what. +April 3rd, 2003 [tushar]: programming: merged gnat with +gcc instructions, made changes to the gcc instructions. + April 2nd, 2003 [larry]: postlfs: sync xfs patch to LFS kernel version. diff --git a/introduction/welcome/credits.xml b/introduction/welcome/credits.xml index 4e6d72288a..77d2fd2bdd 100644 --- a/introduction/welcome/credits.xml +++ b/introduction/welcome/credits.xml @@ -80,8 +80,8 @@ xvid and xsane: Alex Kloss AbiWord, at-spi, ATK, audiofile, avifile, bc, bonobo-activation, bug-buddy, cdrdao, cdrtools, cpio, curl, dhcp, enlightenment, eog, esound, -fcron, fluxbox, FNLIB, gail, galeon, gcc, gconf-editor, gdbm, gedit, -gimp, GLib2, gmp, gnat, gnet, gnome-applets, gnome-desktop, +fcron, fluxbox, FNLIB, gail, galeon, gconf-editor, gdbm, gedit, +gimp, GLib2, gmp, gnet, gnome-applets, gnome-desktop, gnome-games, gnome-icon-theme, gnome-libs, gnome-media, gnome-mime-data, gnome-panel, gnome-session, gnome-system-monitor, gnome-terminal, gnome-themes, gnome-utils, gnome-vfs, @@ -132,7 +132,7 @@ Bauscher MySQL: Jesse Tie-Ten-Quee -gcc2, j2sdk, mozilla, nas, openoffice and STLport: +gcc, gcc2, j2sdk, mozilla, nas, openoffice and STLport: Tushar Teredesai