SF.net SVN: gar:[25141] csw/mgar/pkg/389-ds-base/trunk

[cgrzemba at users.sourceforge.net]

Revision: 25141
          http://sourceforge.net/p/gar/code/25141
Author:   cgrzemba
Date:     2015-06-29 07:34:44 +0000 (Mon, 29 Jun 2015)
Log Message:
-----------
389-ds-base/trunk: update dependencies

Modified Paths:
--------------
    csw/mgar/pkg/389-ds-base/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/389-ds-base/trunk/files/0031-net-snmp-config.patch

Modified: csw/mgar/pkg/389-ds-base/trunk/Makefile
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/Makefile	2015-06-29 07:18:53 UTC (rev 25140)
+++ csw/mgar/pkg/389-ds-base/trunk/Makefile	2015-06-29 07:34:44 UTC (rev 25141)
@@ -68,6 +68,7 @@
 PATCHFILES += 0024-strndup.patch
 # PATCHFILES += 0025-posix-winsync.rawentry.patch
 # PATCHFILES += 0030-reconstruct-memberuid-generation-task.patch
+PATCHFILES += 0031-net-snmp-config.patch
 PATCHFILES += $(PATCHFILES_$(GARCOMPILER))
 
 BUILD_DEP_PKGS += CSWautoconf
@@ -104,8 +105,8 @@
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibnssdbm3
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibpcre1
 RUNTIME_DEP_PKGS_CSW389-ds-base += CSWpm-netaddr-ip
-RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicui18n54
-RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicuuc54
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicui18n55
+RUNTIME_DEP_PKGS_CSW389-ds-base += CSWlibicuuc55
 RUNTIME_DEP_PKGS_CSW389-ds-base_openldap += CSWliblber2-4-2
 RUNTIME_DEP_PKGS_CSW389-ds-base_openldap += CSWlibldap-r2-4-2
 RUNTIME_DEP_PKGS_CSW389-ds-base_openldap += CSWlibldap2-4-2
@@ -170,6 +171,7 @@
 CONFIGURE_ARGS += --with-nspr-lib=$(libdir)
 CONFIGURE_ARGS += --with-nspr-inc=$(includedir)/nspr
 CONFIGURE_ARGS_DBG += --enable-debug
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARFLAVOR))
 
 include gar/category.mk
 

Added: csw/mgar/pkg/389-ds-base/trunk/files/0031-net-snmp-config.patch
===================================================================
--- csw/mgar/pkg/389-ds-base/trunk/files/0031-net-snmp-config.patch	                        (rev 0)
+++ csw/mgar/pkg/389-ds-base/trunk/files/0031-net-snmp-config.patch	2015-06-29 07:34:44 UTC (rev 25141)
@@ -0,0 +1,11 @@
+--- a/m4/netsnmp.m4
++++ b/m4/netsnmp.m4
+@@ -99,7 +99,7 @@ if test -n "$netsnmp_inc"; then
+   fi
+ 
+   if test -n "$NETSNMP_CONFIG"; then
+-    netsnmp_link=`$NETSNMP_CONFIG --agent-libs`
++    netsnmp_link=`$NETSNMP_CONFIG --agent-libs | sed -e 's/-march=[[a-z0-9]]* //'`" \${LD_OPTIONS}"
+   else
+     AC_MSG_ERROR([net-snmp-config not found, specify with --with-netsnmp.])
+   fi

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