Two patches, util-linux-2.12r-PIC-1.patch and
util-linux-2.12r-lseek-1.patch, in HLFS SVN-20061016 for utli-linux
conflict.

From util-linux-2.12r-PIC-1.patch:
File: sfdisk.c
-#if defined (__alpha__) || defined (__ia64__) || defined (__x86_64__)
|| defined (__s390x__)
+#if (defined(__PIC__) || (__pic__) || (__alpha__) || (__ia64__) ||
(__x86_64__) || (__s390x__))
and
File: partx.c
-#if !defined (__alpha__) && !defined (__ia64__) && !defined (__s390x__)
&& !defined(__x86_64__)
+#if !(defined(__PIC__) || (__pic__) || (__alpha__) || (__ia64__) ||
(__s390x__) || (__x86_64__))


From util-linux-2.12r-lseek-1.patch
File: sfdisk.c
-#if defined (__alpha__) || defined (__ia64__) || defined (__x86_64__)
|| defined (__s390x__)
and
File: partx.c
-#if !defined (__alpha__) && !defined (__ia64__) && !defined (__s390x__)
&& !defined(__x86_64__)

--
http://linuxfromscratch.org/mailman/listinfo/hlfs-dev
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page

Reply via email to