Changeset abd464a

Timestamp:

04/08/2015 09:33:38 PM (9 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.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

45acacc

Parents:

25c5f53

Message:

unzip: Use the generic target (new in unzip60, apparently) : this fixes unzipping to files larger than 2GiB - e.g. raspberry pi images - on i686.It also mean we do the same for i686 and x86_64. The previous commented option might have also worked, but I guess nobody used to have any reason to unzip such large files.

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

Files:

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

general/sysutils/unzip.xml

@@ -182 +182 @@
     <application>UnZip</application> by running the following commands:</para> -->
 
-<screen><userinput>case `uname -m` in
-  i?86)
-    sed -i -e 's/DASM_CRC"/DASM_CRC -DNO_LCHMOD"/' unix/Makefile
-    make -f unix/Makefile linux
-    ;;
-  *)
-    sed -i -e 's/CFLAGS="-O -Wall/&amp; -DNO_LCHMOD/' unix/Makefile
-    make -f unix/Makefile linux_noasm
-    ;;
-esac</userinput></screen>
+<screen><userinput>make -f unix/Makefile generic</userinput></screen>
 
     <para>To test the results, issue: <command>make check</command>.</para>
@@ -197 +188 @@
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make prefix=/usr MANDIR=/usr/share/man/man1 install</userinput></screen>
+<screen role="root"><userinput>make prefix=/usr MANDIR=/usr/share/man/man1 \
+ -f unix/Makefile install</userinput></screen>
 
   </sect2>
@@ -204 +196 @@
     <title>Command Explanations</title>
 
-    <para><command>sed ...</command>: This command ensures an obsolete
-    system call is not made.</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>:
-    This sets the compilation flags to allow <application>UnZip</application>
-    to handle files up to 4 GB.</para> -->
+    <para><parameter>make -f unix/Makefile generic</parameter>:
+    This target begins by running a configure script (unlike the older targets
+    such as linux and linux_noasm) which creates a flags file that is then used
+    in the build. This ensures that the 32-bit x86 build receives the right
+    flags to unzip files which which are larger than 2GB when extracted.</para>
 
   </sect2>

introduction/welcome/changelog.xml

@@ -49 +49 @@
       <itemizedlist>
         <listitem>
+          <para>[ken] - Use the generic target in unzip, this fixes unzipping
+          files larger than 2GB on i686.</para>
+        </listitem>
+        <listitem>
           <para>[fernando] - Archive Totem-3.16.0, Grilo-0.2.12 and
           Grilo-Plugins-0.2.14. Fixes