← Commit list

42f8883c7

Eric Andersen
Eric Andersen
2004-05-26
FAILED Duration: 24s

Subject

Per suggestion from Bastian Blank, be less evil when we force fdisk to transparently remap 32-bit interfaces to actually use 64 bit interfaces. -Erik

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

util-linux/Makefile.in+11 -0
@@ -49,3 +49,14 @@ libraries-y+=$(UTILLINUX_DIR)$(UTILLINUX_AR)
$(UTILLINUX_DIR)$(UTILLINUX_AR): $(patsubst %,$(UTILLINUX_DIR)%, $(UTILLINUX-y))
$(AR) -ro $@ $(patsubst %,$(UTILLINUX_DIR)%, $(UTILLINUX-y))
+ifneq ($(strip $(CONFIG_LFS)),y)
+ifeq ($(strip $(FDISK_SUPPORT_LARGE_DISKS)),y)
+
+$(UTILLINUX_DIR)fdisk.o: $(UTILLINUX_DIR)fdisk.c
+ $(CC) $(CFLAGS) \
+ -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \
+ $(EXTRA_CFLAGS) -c -o $@ $<
+
+endif
+endif
+
util-linux/fdisk.c+0 -9
@@ -15,15 +15,6 @@
#define PROC_PARTITIONS "/proc/partitions"
#include <features.h>
-/* Force fdisk to transparently remap 32-bit interfaces
- * to instead really use 64 bit interfaces, at least for
- * glibc and uClibc... */
-#ifndef __USE_FILE_OFFSET64
-# ifdef FDISK_SUPPORT_LARGE_DISKS
-# define __USE_FILE_OFFSET64 1
-# endif
-#endif
-
#include <sys/types.h>
#include <sys/stat.h> /* stat */
#include <ctype.h>