Changeset 0ebda11 for chapter08/gmp.xml

Timestamp:

05/14/2021 10:47:43 AM (3 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

ml-11.0, multilib

Children:

2606939

Parents:

51c01bff

Message:

Remove entities for multilib pathes
Add usage of libc_cv_rtlddir

File:

• chapter08/gmp.xml (modified) (5 diffs)

chapter08/gmp.xml

@@ -143 +143 @@
 CFLAGS="-m32 -O2 -pedantic -fomit-frame-pointer -mtune=generic -march=i686" \
 CXXFLAGS="$CFLAGS" \
-PKG_CONFIG_PATH="&usr-lib-m32;/pkgconfig" \
+PKG_CONFIG_PATH="/usr/lib32/pkgconfig" \
 ./configure             \
     --prefix=/usr       \
     --disable-static    \
     --enable-cxx        \
-    --libdir=&usr-lib-m32; \
-    --includedir=&usr-inc-m32;/gmp</userinput></screen>
+    --libdir=/usr/lib32 \
+    --includedir=/usr/include/m32/gmp</userinput></screen>
 
     <variablelist>
@@ -155 +155 @@
 
       <varlistentry>
-        <term><parameter>--includedir=&usr-inc-m32;/gmp</parameter></term>
+        <term><parameter>--includedir=/usr/include/m32/gmp</parameter></term>
         <listitem>
           <para>Some definitions in gmp.h differs for each arch but
@@ -187 +187 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR&usr-lib-m32;/* &usr-lib-m32;
-cp -Rv DESTDIR&usr-inc-m32;/* &usr-inc-m32;/
+cp -Rv DESTDIR/usr/lib32/* /usr/lib32
+cp -Rv DESTDIR/usr/include/m32/* /usr/include/m32/
 rm -rf DESTDIR</userinput></screen>
 
@@ -215 +215 @@
 CFLAGS="-mx32 -O2 -pedantic -fomit-frame-pointer -mtune=generic -march=x86-64" \
 CXXFLAGS="$CFLAGS" \
-PKG_CONFIG_PATH="&usr-lib-mx32;/pkgconfig" \
+PKG_CONFIG_PATH="/usr/libx32/pkgconfig" \
 ./configure              \
     --prefix=/usr        \
     --disable-static     \
     --enable-cxx         \
-    --libdir=&usr-lib-mx32; \
-    --includedir=&usr-inc-mx32;/gmp</userinput></screen>
+    --libdir=/usr/libx32 \
+    --includedir=/usr/include/mx32/gmp</userinput></screen>
 
     <para>Compile the package:</para>
@@ -245 +245 @@
 
 <screen><userinput remap="install">make DESTDIR=$PWD/DESTDIR install
-cp -Rv DESTDIR&usr-lib-mx32;/* &usr-lib-mx32;
-cp -Rv DESTDIR&usr-inc-mx32;/* &usr-inc-mx32;/
+cp -Rv DESTDIR/usr/libx32/* /usr/libx32
+cp -Rv DESTDIR/usr/include/mx32/* /usr/include/mx32/
 rm -rf DESTDIR</userinput></screen>