Changeset c05cc75

Timestamp:

12/28/2010 11:40:22 PM (13 years ago)

Author:

Ken Moffat <ken@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

d1524623

Parents:

07b2510

Message:

Fix unzip for non-i?86 machines.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@8744 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general.ent (modified) (1 diff)
• general/sysutils/unzip.xml (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general.ent

@@ -4 +4 @@
 -->
 
-<!ENTITY day          "28">                   <!-- Always 2 digits -->
+<!ENTITY day          "29">                   <!-- Always 2 digits -->
 <!ENTITY month        "12">                   <!-- Always 2 digits -->
 <!ENTITY year         "2010">

general/sysutils/unzip.xml

@@ -181 +181 @@
     <application>UnZip</application> by running the following commands:</para> -->
 
-<screen><userinput>make -f unix/Makefile linux</userinput></screen>
+<screen><userinput>case `uname -m` in
+  i?86)
+    make -f unix/Makefile linux
+    ;;
+  *)
+    make -f unix/Makefile linux_noasm
+    ;;
+esac</userinput></screen>
 
     <para>To test the results, issue: <command>make check</command>.</para>
@@ -194 +201 @@
     <title>Command Explanations</title>
 
-    <para><parameter>linux</parameter>:
-    This target in the <filename>Makefile</filename> makes assumptions
-    that are useful for a Linux system when compiling the executables.
-    To obtain alternatives to this target, use <command>make list</command></para>
+    <para><parameter>linux, linux_noasm</parameter>:
+    The linux target in the <filename>Makefile</filename> makes assumptions
+    that are useful for a Linux system when compiling the executables, but
+    also uses some 32-bit x86 assembler code. The linux_noasm target will
+    build on all linux hosts. To obtain alternatives to these targets, use
+    <command>make -f unix/Makefile list</command></para>
 
     <!-- <para><parameter>LOCAL_UNZIP=...</parameter>:

introduction/welcome/changelog.xml

@@ -41 +41 @@
 
 -->
+
+    <listitem>
+      <para>December 29th, 2010</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Fixed unzip-6.0 for non-i?86 (fixes ticket
+          <ulink url="&blfs-ticket-root;3052">#3052</ulink>).</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>