]> git.pld-linux.org Git - packages/linux-ldm.git/blame - linux-ldm-build.patch
- updated ldmdoc to 0.3.2; build just ldmutil
[packages/linux-ldm.git] / linux-ldm-build.patch
CommitLineData
cc5b0da0
JB
1diff -Nur linux-ldm-0.0.7.orig/Makefile linux-ldm-0.0.7/Makefile
2--- linux-ldm-0.0.7.orig/Makefile Sun Jun 23 20:41:22 2002
3+++ linux-ldm-0.0.7/Makefile Sun Jul 7 12:05:34 2002
4@@ -9,8 +9,7 @@
5 # General compile flags
01c1f6f5 6
cc5b0da0 7 CFLAGS += -Wall
01c1f6f5 8-CFLAGS += -g
cc5b0da0 9-CFLAGS += -O2
01c1f6f5 10+CFLAGS += $(OPT)
cc5b0da0 11 CFLAGS += -D_FILE_OFFSET_BITS=64
01c1f6f5 12
cc5b0da0
JB
13 # LDM compile flags
14@@ -23,11 +22,9 @@
01c1f6f5 15
cc5b0da0 16 CFLAGS += -D__KERNEL__
01c1f6f5 17 CFLAGS += -Wstrict-prototypes
01c1f6f5
JB
18-CFLAGS += -fomit-frame-pointer
19 CFLAGS += -fno-strict-aliasing
20 CFLAGS += -pipe
21 CFLAGS += -mpreferred-stack-boundary=2
22-CFLAGS += -march=$(shell uname -m)
23
cc5b0da0 24 # ld flags
01c1f6f5 25
cc5b0da0
JB
26diff -Nur linux-ldm-0.0.7.orig/linux/fs/partitions/check.h linux-ldm-0.0.7/linux/fs/partitions/check.h
27--- linux-ldm-0.0.7.orig/linux/fs/partitions/check.h Thu Jan 1 01:00:00 1970
28+++ linux-ldm-0.0.7/linux/fs/partitions/check.h Sun Jul 7 12:05:34 2002
29@@ -0,0 +1,16 @@
30+/*
31+ * add_partition adds a partitions details to the devices partition
32+ * description.
33+ */
34+void add_gd_partition(struct gendisk *hd, int minor, int start, int size);
35+
36+typedef struct {struct page *v;} Sector;
37+
38+unsigned char *read_dev_sector(struct block_device *, unsigned long, Sector *);
39+
40+static inline void put_dev_sector(Sector p)
41+{
42+ page_cache_release(p.v);
43+}
44+
45+extern int warn_no_part;
46diff -Nur linux-ldm-0.0.7.orig/linux/fs/partitions/msdos.h linux-ldm-0.0.7/linux/fs/partitions/msdos.h
47--- linux-ldm-0.0.7.orig/linux/fs/partitions/msdos.h Thu Jan 1 01:00:00 1970
48+++ linux-ldm-0.0.7/linux/fs/partitions/msdos.h Sun Jul 7 12:05:34 2002
01c1f6f5
JB
49@@ -0,0 +1,9 @@
50+/*
51+ * fs/partitions/msdos.h
52+ */
53+
54+#define MSDOS_LABEL_MAGIC 0xAA55
55+
cc5b0da0 56+int msdos_partition(struct gendisk *hd, struct block_device *bdev,
01c1f6f5
JB
57+ unsigned long first_sector, int first_part_minor);
58+
cc5b0da0
JB
59diff -Nur linux-ldm-0.0.7.orig/test/Makefile linux-ldm-0.0.7/test/Makefile
60--- linux-ldm-0.0.7.orig/test/Makefile Sun Jun 23 20:41:22 2002
61+++ linux-ldm-0.0.7/test/Makefile Sun Jul 7 12:06:19 2002
62@@ -11,6 +11,7 @@
63 CFLAGS += -include extra.h
64 CFLAGS += -I$(KERNEL)/include
65 CFLAGS += -I$(KERNEL)/fs/partitions
66+CFLAGS += -I../linux/fs/partitions
01c1f6f5 67
cc5b0da0 68 all: $(OUT)
01c1f6f5 69
cc5b0da0
JB
70--- linux-ldm-0.0.7/linux/fs/partitions/ldm.c.orig Sun Jun 23 20:41:22 2002
71+++ linux-ldm-0.0.7/linux/fs/partitions/ldm.c Sun Jul 7 12:30:02 2002
72@@ -34,6 +34,8 @@
73 #include "check.h"
74 #include "msdos.h"
01c1f6f5 75
cc5b0da0
JB
76+#undef memcpy
77+
78 #ifdef CONFIG_LDM_EXPORT_SYMBOLS
79 # define static
80 #endif
81--- linux-ldm-0.0.7/ldmutil/makefile.orig Sun Jun 23 20:41:22 2002
82+++ linux-ldm-0.0.7/ldmutil/makefile Sun Jul 7 12:32:50 2002
83@@ -2,7 +2,7 @@
84 TARGET=ldmutil
85 SRC=main.cpp ldm_db.cpp diskio.cpp ldm_parse.cpp ptypenames.cpp
86 OBJ=$(SRC:%.cpp=%.o)
87-FLAGS=-O3
88+FLAGS=$(OPT)
89 LDFLAGS=-Xlinker --strip-all
90 LIB=
91 INC=
e977adb8
JB
92--- linux-ldm-0.0.8/ldmutil/ldm_db.cpp.orig 2001-12-14 20:27:00.000000000 +0100
93+++ linux-ldm-0.0.8/ldmutil/ldm_db.cpp 2023-06-20 18:18:20.385442718 +0200
94@@ -21,6 +21,7 @@
95 * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
96 */
97
98+#include <cstring>
99 #include <iostream>
100 #include <iomanip>
101 #include <list>
This page took 0.053858 seconds and 4 git commands to generate.