[leaf-commits] src/bering-uclibc4/source/ulogd ulogd-rpath.patch, NONE, 1.1 buildtool.cfg, 1.2, 1.3 buildtool.mk, 1.2, 1.3

Update of /cvsroot/leaf/src/bering-uclibc4/source/ulogd
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv18906

Modified Files:
	buildtool.cfg buildtool.mk 
Added Files:
	ulogd-rpath.patch 
Log Message:
fix linking error with mysql enabled

found at
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=527534



--- NEW FILE: ulogd-rpath.patch ---
diff -urN ulogd-1.24.orig/configure ulogd-1.24/configure
--- ulogd-1.24.orig/configure	2006-01-25 12:15:22.000000000 +0100
+++ ulogd-1.24/configure	2010-09-29 16:09:42.061641287 +0200
@@ -1728,7 +1728,7 @@
 EOF
 
         MYSQLINCLUDES=`$d/mysql_config --include`
-        MYSQLLIBS=`$d/mysql_config --libs`
+        MYSQLLIBS=`$d/mysql_config --libs | sed 's/-rdynamic//'` 
 
 	DATABASE_DIR="${DATABASE_DIR} mysql"
 
diff -urN ulogd-1.24.orig/configure.in ulogd-1.24/configure.in
--- ulogd-1.24.orig/configure.in	2005-11-25 20:58:27.000000000 +0100
+++ ulogd-1.24/configure.in	2010-09-29 16:11:47.257659473 +0200
@@ -60,7 +60,7 @@
 else
         AC_DEFINE(HAVE_MYSQL)
         MYSQLINCLUDES=`$d/mysql_config --include`
-        MYSQLLIBS=`$d/mysql_config --libs`
+        MYSQLLIBS=`$d/mysql_config --libs | sed 's/-rdynamic//'`
 
 	DATABASE_DIR="${DATABASE_DIR} mysql"
 
diff -urN ulogd-1.24.orig/Makefile.in ulogd-1.24/Makefile.in
--- ulogd-1.24.orig/Makefile.in	2006-01-25 12:26:51.000000000 +0100
+++ ulogd-1.24/Makefile.in	2010-09-29 16:10:32.885674779 +0200
@@ -63,7 +63,7 @@
 	@for d in $(SUBDIRS); do if ! make -C $$d; then exit 1; fi; done
 
 ulogd: ulogd.c $(LIBIPULOG) include/ulogd/ulogd.h conffile/conffile.o $(LIBIPULOG)/libipulog.a ulogd.conf
-	$(CC) $(CFLAGS) -rdynamic $< conffile/conffile.o $(LIBIPULOG)/libipulog.a -o $@ $(LIBS)
+	$(CC) $(CFLAGS) $< conffile/conffile.o $(LIBIPULOG)/libipulog.a -o $@ $(LIBS)
 
 edit = sed -e 's,@libdir\@,$(ULOGD_LIB_PATH),g'
 

Index: buildtool.cfg
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/ulogd/buildtool.cfg,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** buildtool.cfg	5 Jun 2010 21:27:34 -0000	1.2
--- buildtool.cfg	29 Sep 2010 14:18:06 -0000	1.3
***************
*** 50,57 ****
  </File>
  
  <Package>
  	<ulogd>
  		Version = 1.24
! 		Revision = 1
  
  		Help <<EOF
--- 50,64 ----
  </File>
  
+ <File ulogd-rpath.patch>
+   Server = cvs4-sourceforge
+   Revision = HEAD
+   envname = ULOGD_PATCH3
+   Directory = ulogd
+ </File>
+ 
  <Package>
  	<ulogd>
  		Version = 1.24
! 		Revision = 2
  
  		Help <<EOF

Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/ulogd/buildtool.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** buildtool.mk	9 Aug 2010 15:55:43 -0000	1.2
--- buildtool.mk	29 Sep 2010 14:18:06 -0000	1.3
***************
*** 11,14 ****
--- 11,15 ----
  	cat $(ULOGD_PATCH1) | patch -d $(ULOGD_DIR) -p1
  	cat $(ULOGD_PATCH2) | patch -d $(ULOGD_DIR) -p1
+ 	cat $(ULOGD_PATCH3) | patch -d $(ULOGD_DIR) -p1
  	touch $(ULOGD_DIR)/.source
  


------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev