SOURCES: dmraid-as-needed.patch (NEW) - fix build with --as-needed...

[sparky]

Author: sparky                       Date: Sun Jul 30 23:22:51 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fix build with --as-needed:
  libdmraid.so is the one linked with libdevmapper.so, not dmraid executable

---- Files affected:
SOURCES:
   dmraid-as-needed.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/dmraid-as-needed.patch
diff -u /dev/null SOURCES/dmraid-as-needed.patch:1.1
--- /dev/null	Mon Jul 31 01:22:51 2006
+++ SOURCES/dmraid-as-needed.patch	Mon Jul 31 01:22:46 2006
@@ -0,0 +1,38 @@
+--- dmraid/lib/Makefile.in	2006-07-30 22:48:53.000000000 +0000
++++ dmraid.as-needed/lib/Makefile.in	2006-07-30 22:52:10.000000000 +0000
+@@ -53,6 +53,24 @@
+   endif
+ endif
+ 
++ifeq ("@KLIBC@", "yes")
++	DMRAIDLIBS += -ldevmapper_klibc
++else
++	ifeq ("@DIETLIBC@", "yes")
++		DMRAIDLIBS += -ldevmapper_dietc
++	else
++		DMRAIDLIBS += -ldevmapper
++	endif
++
++#	ifeq ("@LIBSELINUX@", "yes")
++#		DMRAIDLIBS += -lselinux
++#	endif
++#
++#	ifeq ("@LIBSEPOL@", "yes")
++#		DMRAIDLIBS += -lsepol
++#	endif
++endif
++
+ all:
+ 	@echo "$(TARGETS) $(INSTALL_TARGETS)"
+ 
+--- dmraid/make.tmpl.in	2006-07-30 22:55:01.000000000 +0000
++++ dmraid.as-needed/make.tmpl.in	2006-07-30 22:57:38.000000000 +0000
+@@ -129,7 +129,7 @@
+ 
+ %.so: $(OBJECTS)
+ 	$(CC) -shared -Wl,-soname,$(notdir $@).$(DMRAID_LIB_VERSION) \
+-	-Wl,--version-script,.export.sym $(OBJECTS) -o $@
++	-Wl,--version-script,.export.sym $(DMRAIDLIBS) $(LDFLAGS) $(OBJECTS) -o $@
+ 
+ $(LIB_STATIC): $(OBJECTS)
+ 	$(RM) $@
================================================================