Changeset de61ab1 for multimedia/cdwriteutils/cdrtools.xml

Timestamp:

08/27/2024 08:03:55 AM (3 weeks ago)

Author:

Thomas Trepl <thomas@…>

Branches:

lazarus

Children:

53d0e62a

Parents:

7d55a6a (diff), c36ca685 (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.

Message:

Merge trunk

File:

• multimedia/cdwriteutils/cdrtools.xml (modified) (3 diffs)

multimedia/cdwriteutils/cdrtools.xml

@@ -32 +32 @@
     </para>
 
-    &lfs121_checked;
+    &lfs122_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -94 +94 @@
     </para>
 
-<screen><userinput>export GMAKE_NOWARN=true &amp;&amp;
-make -j1 INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root</userinput></screen>
+<screen><userinput>sed -i 's|/opt/schily|/usr|g'           DEFAULTS/Defaults.linux &amp;&amp;
+sed -i 's|DEFINSGRP=.*|DEFINSGRP=root|' DEFAULTS/Defaults.linux &amp;&amp;
+sed -i 's|INSDIR=\s*sbin|INSDIR=bin|'   rscsi/Makefile          &amp;&amp;
+
+export GMAKE_NOWARN=true &amp;&amp;
+export CFLAGS="$CFLAGS -std=gnu89 -fno-strict-aliasing" &amp;&amp;
+
+make -j1 INS_BASE=/usr  \
+         DEFINSUSR=root \
+         DEFINSGRP=root \
+         VERSION_OS="LinuxFromScratch"</userinput></screen>
 
     <para>
@@ -105 +114 @@
     </para>
 
-<screen role="root"><userinput>export GMAKE_NOWARN=true &amp;&amp;
-make INS_BASE=/usr MANSUFF_LIB=3cdr DEFINSUSR=root DEFINSGRP=root install &amp;&amp;
+<screen role="root"><userinput>GMAKE_NOWARN=true &amp;&amp;
+
+make INS_BASE=/usr    \
+     DEFINSUSR=root   \
+     DEFINSGRP=root   \
+     MANSUFF_LIB=3cdr \
+     install          &amp;&amp;
+
 install -v -m755 -d /usr/share/doc/cdrtools-&cdrtools-version; &amp;&amp;
 install -v -m644 README.* READMEs/* ABOUT doc/*.ps \