[csw-devel] SF.net SVN: gar:[19083] csw/mgar/pkg/cadaver/trunk

[chninkel at users.sourceforge.net]

Revision: 19083
          http://gar.svn.sourceforge.net/gar/?rev=19083&view=rev
Author:   chninkel
Date:     2012-08-24 18:33:36 +0000 (Fri, 24 Aug 2012)
Log Message:
-----------
cadaver/trunk: enabled direct binding

Modified Paths:
--------------
    csw/mgar/pkg/cadaver/trunk/Makefile
    csw/mgar/pkg/cadaver/trunk/files/changelog.CSW

Removed Paths:
-------------
    csw/mgar/pkg/cadaver/trunk/files/0002-Neon-LD-option-fix.patch

Modified: csw/mgar/pkg/cadaver/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cadaver/trunk/Makefile	2012-08-24 17:45:37 UTC (rev 19082)
+++ csw/mgar/pkg/cadaver/trunk/Makefile	2012-08-24 18:33:36 UTC (rev 19083)
@@ -49,12 +49,6 @@
 # ncurses
 PATCHFILES = 0001-no-curses-dependency.patch
 
-# Let's not trust neon-config until Bug 4984 is fixed
-# https://www.opencsw.org/mantis/view.php?id=4984
-# This allow us to not depend directly anymore on a bunch
-# of libraries
-PATCHFILES += 0002-Neon-LD-option-fix.patch
-
 ##### Build and installation information #####
 
 CONFIGURE_ARGS = $(DIRPATHS)
@@ -62,6 +56,8 @@
 CONFIGURE_ARGS += --with-ssl=openssl
 CONFIGURE_ARGS += --with-expat
 
+EXTRA_LDFLAGS = -z ignore -Bdirect 
+
 TEST_SCRIPTS =
 
 include gar/category.mk

Deleted: csw/mgar/pkg/cadaver/trunk/files/0002-Neon-LD-option-fix.patch
===================================================================
--- csw/mgar/pkg/cadaver/trunk/files/0002-Neon-LD-option-fix.patch	2012-08-24 17:45:37 UTC (rev 19082)
+++ csw/mgar/pkg/cadaver/trunk/files/0002-Neon-LD-option-fix.patch	2012-08-24 18:33:36 UTC (rev 19083)
@@ -1,34 +0,0 @@
-From a2877acd081224c3c624eafa876dd7fb33e2382d Mon Sep 17 00:00:00 2001
-From: Yann Rouillard <yann at pleiades.fr.eu.org>
-Date: Sun, 12 Aug 2012 16:20:27 +0200
-Subject: [PATCH] sdfksdfsdf
-
----
- m4/neon/neon.m4 |    4 +-
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/m4/neon/neon.m4 b/m4/neon/neon.m4
-index edff529..d06ab70 100644
---- a/m4/neon/neon.m4
-+++ b/m4/neon/neon.m4
-@@ -181,7 +181,7 @@ m4_ifdef([ne_require_major], [
-     ne_save_LIBS="$LIBS"
-     ne_save_CFLAGS="$CFLAGS"
-     CFLAGS="$CFLAGS `$NEON_CONFIG --cflags`"
--    LIBS="$LIBS `$NEON_CONFIG --libs`"
-+    LIBS="$LIBS -lneon"
-     ne_libver=`$NEON_CONFIG --version | sed -e "s/neon //g"`
-     # Check whether it's possible to link against neon
-     AC_CACHE_CHECK([linking against neon], [ne_cv_lib_neon],
-@@ -252,7 +252,7 @@ neon_prefix=`$NEON_CONFIG --prefix`
- NEON_CHECK_VERSION([
-     # Pick up CFLAGS and LIBS needed
-     CFLAGS="$CFLAGS `$NEON_CONFIG --cflags`"
--    NEON_LIBS="$NEON_LIBS `$NEON_CONFIG --libs`"
-+    NEON_LIBS="$NEON_LIBS -lneon"
-     # Pick up library version
-     set dummy `$NEON_CONFIG --version | sed 's/\./ /g'`
-     NE_VERSION_MAJOR=[$]3; NE_VERSION_MINOR=[$]4; NE_VERSION_PATCH=[$]5
--- 
-1.7.10.3
-

Modified: csw/mgar/pkg/cadaver/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/cadaver/trunk/files/changelog.CSW	2012-08-24 17:45:37 UTC (rev 19082)
+++ csw/mgar/pkg/cadaver/trunk/files/changelog.CSW	2012-08-24 18:33:36 UTC (rev 19083)
@@ -1,3 +1,11 @@
+cadaver (0.23.3,rev=2012.08.24) unstable
+
+  * Enabled direct binding during build.
+  * Use ld "-z ignore" option to avoid linking with useless libraries
+    instead of patching the configure system
+
+ -- Yann rouillard <yann at opencsw.org>  Fri, 24 Aug 2012 20:32:21 +0200
+
 cadaver (0.23.3,rev=2012.08.12) unstable
 
   * Removed superfluous dependancies: 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.