Browse Source

Fixed device-mapper to build again against dietlibc

early
Alejandro Mery 17 years ago
parent
commit
bc6d67f000
  1. 23
      base/device-mapper/dietlibc.patch
  2. 16
      base/device-mapper/no_dynamic.diff

23
base/device-mapper/dietlibc.patch

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../device-mapper/dietlibc.patch
# Copyright (C) 2007 The OpenSDE Project
# Copyright (C) 2007 - 2008 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
@ -14,13 +14,16 @@
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- ./dmsetup/dmsetup.c.orig 2007-08-15 16:01:23.000000000 -0400
+++ ./dmsetup/dmsetup.c 2007-08-15 16:01:45.000000000 -0400
@@ -37,6 +37,7 @@
#include <sys/param.h>
#include <locale.h>
#include <langinfo.h>
+#include <stdint.h>
--- ./lib/libdevmapper.h.orig 2008-03-10 23:00:02.000000000 +0000
+++ ./lib/libdevmapper.h 2008-03-10 23:02:49.000000000 +0000
@@ -24,6 +24,10 @@
# include <linux/types.h>
#endif
#include <fcntl.h>
#include <sys/stat.h>
+#ifdef __dietlibc__
+# include <stdint.h>
+#endif
+
#include <limits.h>
#include <string.h>
#include <stdlib.h>

16
base/device-mapper/no_dynamic.diff

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../device-mapper/no_dynamic.diff
# Copyright (C) 2007 The OpenSDE Project
# Copyright (C) 2007 - 2008 The OpenSDE Project
# Copyright (C) 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
@ -26,19 +26,19 @@
ifeq ("@STATIC_LINK@", "yes")
INSTALL_TYPE += install_static
--- ./make.tmpl.in.orig 2006-07-07 16:36:47.000000000 +0000
+++ ./make.tmpl.in 2006-07-07 16:37:19.000000000 +0000
--- ./make.tmpl.in.orig 2007-10-03 10:48:27.000000000 +0000
+++ ./make.tmpl.in 2008-03-10 22:49:44.000000000 +0000
@@ -123,7 +123,7 @@
.PHONY: $(SUBDIRS) $(SUBDIRS.install) $(SUBDIRS.clean) $(SUBDIRS.distclean)
.PHONY: $(SUBDIRS.pofile)
-TARGETS += $(LIB_SHARED) $(LIB_STATIC)
-TARGETS += $(LIB_SHARED) $(LIB_STATIC) $(VERSIONED_SHLIB)
+TARGETS += $(LIB_STATIC)
all: $(SUBDIRS) $(TARGETS)
--- ./dmsetup/Makefile.in.orig 2006-07-07 18:15:15.000000000 +0000
+++ ./dmsetup/Makefile.in 2006-07-07 18:15:36.000000000 +0000
--- ./dmsetup/Makefile.in.orig 2007-08-21 20:32:30.000000000 +0000
+++ ./dmsetup/Makefile.in 2008-03-10 22:53:55.000000000 +0000
@@ -16,8 +16,8 @@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
@ -47,10 +47,10 @@
-INSTALL_TYPE = install_dynamic
+TARGETS =
+INSTALL_TYPE =
LIB_PTHREAD = @LIB_PTHREAD@
ifeq ("@STATIC_LINK@", "yes")
TARGETS += dmsetup.static
@@ -45,5 +45,5 @@
@@ -47,5 +47,5 @@
$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
install_static: dmsetup.static

Loading…
Cancel
Save