Changeset 6fcaede for BOOK/final-system
- Timestamp:
- Jul 7, 2009, 8:49:42 AM (15 years ago)
- Branches:
- clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
- Children:
- b26d64d
- Parents:
- 4261659 (diff), 53750600 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)links above to see all the changes relative to each parent. - Location:
- BOOK/final-system
- Files:
-
- 1 added
- 11 edited
-
common/cloog-ppl.xml (modified) (1 diff)
-
common/iproute2.xml (modified) (3 diffs)
-
common/ppl.xml (modified) (1 diff)
-
mips64-chapter.xml (modified) (1 diff)
-
mips64/ppl-64bit.xml (added)
-
multilib/cloog-ppl-64bit.xml (modified) (1 diff)
-
multilib/cloog-ppl-n32.xml (modified) (1 diff)
-
multilib/cloog-ppl.xml (modified) (1 diff)
-
multilib/iproute2.xml (modified) (2 diffs)
-
multilib/ppl-64bit.xml (modified) (2 diffs)
-
multilib/ppl-n32.xml (modified) (2 diffs)
-
multilib/ppl.xml (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
BOOK/final-system/common/cloog-ppl.xml
r4261659 r6fcaede 32 32 33 33 <screen os="b"><userinput>CC="gcc -isystem /usr/include" LDFLAGS="-Wl,-rpath-link,/lib" \ 34 ./configure --prefix=/usr --enable-shared --with-gmp =/usr\35 --with-ppl=/usr</userinput></screen>34 ./configure --prefix=/usr --enable-shared --with-gmp \ 35 --with-ppl</userinput></screen> 36 36 37 37 <para os="c">Compile the package:</para> -
BOOK/final-system/common/iproute2.xml
r4261659 r6fcaede 38 38 <para os="a">Compile the package:</para> 39 39 40 <screen os="b"><userinput>make DESTDIR= /DOCDIR=/usr/share/doc/iproute2 \40 <screen os="b"><userinput>make DESTDIR= DOCDIR=/usr/share/doc/iproute2 \ 41 41 MANDIR=/usr/share/man</userinput></screen> 42 42 … … 45 45 46 46 <varlistentry> 47 <term><parameter>DESTDIR= /</parameter></term>47 <term><parameter>DESTDIR=</parameter></term> 48 48 <listitem> 49 49 <para>This option overrides the default DESTDIR of /usr, so that … … 69 69 <para os="e">Install the package:</para> 70 70 71 <screen os="f"><userinput>make D OCDIR=/usr/share/doc/iproute2 \71 <screen os="f"><userinput>make DESTDIR= DOCDIR=/usr/share/doc/iproute2 \ 72 72 MANDIR=/usr/share/man install</userinput></screen> 73 73 -
BOOK/final-system/common/ppl.xml
r4261659 r6fcaede 30 30 <para os="a">Prepare PPL for compilation:</para> 31 31 32 <screen os="b"><userinput>CC="gcc -isystem /usr/include" LDFLAGS="-Wl,-rpath-link,/lib" \ 33 ./configure --prefix=/usr --enable-shared --with-libgmp-prefix=/usr \ 34 --with-libgmpxx-prefix=/usr</userinput></screen> 32 <screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include" \ 33 CXX="g++ -isystem /usr/include" \ 34 LDFLAGS="-Wl,-rpath-link,/lib" \ 35 ./configure --prefix=/usr --enable-shared</userinput></screen> 35 36 36 37 <para os="c">Compile the package:</para> -
BOOK/final-system/mips64-chapter.xml
r4261659 r6fcaede 30 30 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ppl.xml"/> 31 31 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ppl-n32.xml"/> 32 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="m ultilib/ppl-64bit.xml"/>32 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/ppl-64bit.xml"/> 33 33 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/cloog-ppl.xml"/> 34 34 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/cloog-ppl-n32.xml"/> -
BOOK/final-system/multilib/cloog-ppl-64bit.xml
r4261659 r6fcaede 38 38 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \ 39 39 LDFLAGS="-Wl,-rpath-link,/lib64 ${BUILD64}" ./configure --prefix=/usr \ 40 --libdir=/usr/lib64 --enable-shared --with-gmp=/usr\41 --with-ppl =/usr</userinput></screen>40 --libdir=/usr/lib64 --enable-shared --with-gmp \ 41 --with-ppl</userinput></screen> 42 42 43 43 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" -
BOOK/final-system/multilib/cloog-ppl-n32.xml
r4261659 r6fcaede 37 37 xpointer="xpointer(//*[@os='a'])"/> 38 38 39 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD N32}" \39 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDM32}" \ 40 40 LDFLAGS="-Wl,-rpath-link,/lib32 ${BUILDN32}" ./configure --prefix=/usr \ 41 --libdir=/usr/lib32 --enable-shared\42 --with- libgmp-prefix=/usr --with-libgmpxx-prefix=/usr</userinput></screen>41 --libdir=/usr/lib32 --enable-shared --with-gmp \ 42 --with-ppl</userinput></screen> 43 43 44 44 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" -
BOOK/final-system/multilib/cloog-ppl.xml
r4261659 r6fcaede 39 39 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \ 40 40 LDFLAGS="-Wl,-rpath-link,/lib ${BUILD32}" ./configure --prefix=/usr \ 41 42 --with-gmp =/usr --with-ppl=/usr</userinput></screen>41 --host=${CLFS_TARGET32} --enable-shared \ 42 --with-gmp --with-ppl</userinput></screen> 43 43 44 44 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" -
BOOK/final-system/multilib/iproute2.xml
r4261659 r6fcaede 38 38 xpointer="xpointer(//*[@os='a'])"/> 39 39 40 <screen os="b"><userinput>make CC="gcc ${BUILD64}" DESTDIR= /LIBDIR=/usr/lib64 \40 <screen os="b"><userinput>make CC="gcc ${BUILD64}" DESTDIR= LIBDIR=/usr/lib64 \ 41 41 DOCDIR=/usr/share/doc/iproute2 MANDIR=/usr/share/man</userinput></screen> 42 42 … … 53 53 xpointer="xpointer(//*[@os='e'])"/> 54 54 55 <screen os="f"><userinput>make LIBDIR=/usr/lib64 \55 <screen os="f"><userinput>make DESTDIR= LIBDIR=/usr/lib64 \ 56 56 DOCDIR=/usr/share/doc/iproute2 \ 57 57 MANDIR=/usr/share/man install</userinput></screen> -
BOOK/final-system/multilib/ppl-64bit.xml
r4261659 r6fcaede 36 36 xpointer="xpointer(//*[@os='a'])"/> 37 37 38 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \ 39 LDFLAGS="-Wl,-rpath-link,/lib64 ${BUILD64}" ./configure --prefix=/usr \ 40 --libdir=/usr/lib64 --enable-shared \ 41 --with-libgmp-prefix=/usr --with-libgmpxx-prefix=/usr</userinput></screen> 38 <screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include ${BUILD64}" \ 39 CXX="g++ -isystem /usr/include ${BUILD64}" \ 40 LDFLAGS="-Wl,-rpath-link,/lib64 ${BUILD64}" \ 41 ./configure --prefix=/usr \ 42 --libdir=/usr/lib64 --enable-shared</userinput></screen> 42 43 43 44 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" … … 69 70 xpointer="xpointer(//*[@os='i'])"/> 70 71 72 <para os="m1">Prepare <filename>ppl-config</filename> to be wrapped by 73 the multiarch wrapper and then wrap it:</para> 74 75 <screen os="m2"><userinput>mv -v /usr/bin/ppl-config{,-64} 76 ln -svf multiarch_wrapper /usr/bin/ppl-config</userinput></screen> 77 78 <para os="j">Create the 64bit header file:</para> 79 80 <screen os="k"><userinput>mv -v /usr/include/ppl{,-64}.hh</userinput></screen> 81 82 <para os="l">Finally, create a stub header in the place of the originals:</para> 83 84 <screen os="m"><userinput>cat > /usr/include/ppl.hh << "EOF" 85 /* ppl.hh - Stub Header */ 86 #ifndef __STUB__PPL_HH__ 87 #define __STUB__PPL_HH__ 88 89 #if defined(__x86_64__) || \ 90 defined(__sparc64__) || \ 91 defined(__arch64__) || \ 92 defined(__powerpc64__) || \ 93 defined (__s390x__) 94 # include "ppl-64.h" 95 #else 96 # include "ppl-32.h" 97 #endif 98 99 #endif /* __STUB__PPL_HH__ */ 100 EOF</userinput></screen> 101 71 102 </sect2> 72 103 -
BOOK/final-system/multilib/ppl-n32.xml
r4261659 r6fcaede 37 37 xpointer="xpointer(//*[@os='a'])"/> 38 38 39 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \ 40 LDFLAGS="-Wl,-rpath-link,/lib32 ${BUILDN32}" ./configure --prefix=/usr \ 41 --libdir=/usr/lib32 --enable-shared --with-libgmp-prefix=/usr \ 42 --with-libgmpxx-prefix=/usr</userinput></screen> 39 <screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include ${BUILDN32}" \ 40 CXX="g++ -isystem /usr/include ${BUILDN32}" \ 41 LDFLAGS="-Wl,-rpath-link,/lib32 ${BUILDN32}" \ 42 ./configure --prefix=/usr \ 43 --libdir=/usr/lib32 --enable-shared</userinput></screen> 43 44 44 45 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" … … 70 71 xpointer="xpointer(//*[@os='i'])"/> 71 72 73 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" 74 href="ppl.xml" 75 xpointer="xpointer(//*[@os='m1'])"/> 76 77 <screen os="m2"><userinput>mv -v /usr/bin/ppl-config{,-n32}</userinput></screen> 78 79 <para os="j">Create the N32 header file:</para> 80 81 <screen os="k"><userinput>mv -v /usr/include/ppl{,-n32}.hh</userinput></screen> 82 72 83 </sect2> 73 84 -
BOOK/final-system/multilib/ppl.xml
r4261659 r6fcaede 37 37 xpointer="xpointer(//*[@os='a'])"/> 38 38 39 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \ 39 <screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include ${BUILD32}" \ 40 CXX="g++ -isystem /usr/include ${BUILD32}" \ 40 41 LDFLAGS="-Wl,-rpath-link,/lib ${BUILD32}" \ 41 ./configure --prefix=/usr --host=${CLFS_TARGET32} --enable-shared\42 --with-libgmp-prefix=/usr --with-libgmpxx-prefix=/usr</userinput></screen>42 ./configure --prefix=/usr --host=${CLFS_TARGET32} \ 43 --enable-shared</userinput></screen> 43 44 44 45 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" … … 70 71 xpointer="xpointer(//*[@os='i'])"/> 71 72 73 <para os="m1">Prepare <filename>ppl-config</filename> to be wrapped by 74 the multiarch wrapper:</para> 75 76 <screen os="m2"><userinput>mv -v /usr/bin/ppl-config{,-32}</userinput></screen> 77 78 <para os="j">One of the headers installed by PPL is architecture specific. Programs compiled as 32bit will require the header provided by the 32bit installation of PPL. The same applies for 64bit programs. Move the header so a wrapper can be put in its place later:</para> 79 80 <screen os="k"><userinput>mv -v /usr/include/ppl{,-32}.hh</userinput></screen> 81 82 72 83 </sect2> 73 84
Note:
See TracChangeset
for help on using the changeset viewer.
