Android-x86
Fork
Faire un don

  • R/O
  • HTTP
  • SSH
  • HTTPS

external-parted: Commit

external/parted


Commit MetaInfo

Révision89f9348783818fc25426e7282d6ad96d0ad50baa (tree)
l'heure2015-10-16 11:25:41
AuteurChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Message de Log

parted: fix building issues on Android 6.0

Change Summary

Modification

--- a/Android.mk
+++ b/Android.mk
@@ -1,2 +1 @@
11 include $(call all-subdir-makefiles)
2-
--- a/include/config.h
+++ b/include/config.h
@@ -21,10 +21,13 @@
2121 #define HAVE_WCHAR_H
2222 #define HAVE_DECL_STRERROR_R 1
2323 #define HAVE_DECL___FPENDING 0
24+#define HAVE_LONG_LONG_INT 1
2425
26+#ifdef __LP64__
27+#define SIZEOF_OFF_T 8
28+#else
2529 #define SIZEOF_OFF_T 4
26-
27-#define linux
30+#endif
2831
2932 #define S_IREAD S_IRUSR
3033 #define S_IWRITE S_IWUSR
--- a/libparted/Android.mk
+++ b/libparted/Android.mk
@@ -36,8 +36,6 @@ LOCAL_STATIC_LIBRARIES := libgnulib libparted-fs
3636 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include \
3737 $(LOCAL_PATH)/../lib \
3838 external/e2fsprogs/lib \
39- fs \
40- labels
4139
4240 include $(BUILD_STATIC_LIBRARY)
4341
--- a/libparted/device.c
+++ b/libparted/device.c
@@ -154,7 +154,7 @@ ped_device_get (const char* path)
154154 PED_ASSERT (path != NULL);
155155 /* Don't canonicalize /dev/mapper paths, see tests/symlink.c */
156156 if (strncmp (path, "/dev/mapper/", 12))
157- normal_path = canonicalize_file_name (path);
157+ normal_path = realpath(path, NULL);
158158 if (!normal_path)
159159 /* Well, maybe it is just that the file does not exist.
160160 * Try it anyway. */
Afficher sur ancien navigateur de dépôt.