[csw-devel] SF.net SVN: gar:[8824] csw/mgar/pkg/netsnmp/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Thu Feb 25 17:03:22 CET 2010
Revision: 8824
http://gar.svn.sourceforge.net/gar/?rev=8824&view=rev
Author: dmichelsen
Date: 2010-02-25 16:03:16 +0000 (Thu, 25 Feb 2010)
Log Message:
-----------
netsnmp: Fixes for Perl and 64 bit
Modified Paths:
--------------
csw/mgar/pkg/netsnmp/trunk/Makefile
csw/mgar/pkg/netsnmp/trunk/checksums
csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff
Modified: csw/mgar/pkg/netsnmp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/netsnmp/trunk/Makefile 2010-02-25 16:02:24 UTC (rev 8823)
+++ csw/mgar/pkg/netsnmp/trunk/Makefile 2010-02-25 16:03:16 UTC (rev 8824)
@@ -12,16 +12,19 @@
SF_PROJ = net-snmp
MASTER_SITES = $(SF_MIRRORS)
-DISTFILES = $(SF_PROJ)-$(GARVERSION).tar.gz
-
DISTNAME = $(SF_PROJ)-$(GARVERSION)
+DISTFILES = $(DISTNAME).tar.gz
+# Patch for perl modules
+PATCHFILES = perl_makefiles.diff
+# Patch for python module
+PATCHFILES += Makefile.in.diff
+
SPKG_SOURCEURL = http://www.net-snmp.org/
BUILD_DEP_PKGS = CSWpysetuptools
+RUNTIME_DEP_PKGS = CSWosslrt CSWtcpwrap CSWpython
-RUNTIME_DEP_PKGS += CSWosslrt CSWtcpwrap CSWpython
-
# We define upstream file regex so we can be notifed of new upstream software release
UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=12694
UPSTREAM_USE_SF = 1
@@ -30,44 +33,48 @@
BUILD64 = 1
NOISAEXEC = 1
+CONFIGURE_ARGS_mm-32 = --disable-embedded-perl --with-perl-modules=yes
+CONFIGURE_ARGS_mm-32 += --with-python-modules=yes
+CONFIGURE_ARGS_mm-64 = --disable-embedded-perl --without-perl-modules
+CONFIGURE_ARGS_mm-64 += --without-python-modules
+
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --with-default-snmp-version=1
CONFIGURE_ARGS += --with-sys-contact=unknown
CONFIGURE_ARGS += --with-sys-location=unknown
CONFIGURE_ARGS += --with-logfile=/var/log/snmpd.log
CONFIGURE_ARGS += --with-persistent-directory=/opt/csw/var/net-snmp
-CONFIGURE_ARGS += '--with-mib-modules=ucd-snmp/diskio agentx mibII/mta_sendmail'
-CONFIGURE_ARGS += '--with-libwrap=/opt/csw/lib'
-CONFIGURE_ARGS += '--enable-ipv6'
-CONFIGURE_ARGS += '--with-transports=UDP TCP Unix'
-#CONFIGURE_ARGS += '--disable-embedded-perl'
-CONFIGURE_ARGS += '--with-perl-modules=yes'
-CONFIGURE_ARGS += '--with-python-modules=yes'
+CONFIGURE_ARGS += --with-mib-modules="ucd-snmp/diskio agentx mibII/mta_sendmail"
+CONFIGURE_ARGS += --with-libwrap=/opt/csw/lib
+CONFIGURE_ARGS += --enable-ipv6
+CONFIGURE_ARGS += --with-transports="UDP TCP Unix"
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_mm-$(MEMORYMODEL))
-# Patch for perl modules
-PATCHFILES = perl_makefiles.diff
-# Patch for python module
-PATCHFILES += Makefile.in.diff
+EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod
-#LD_OPTIONS =
-#EXTRA_COMMON_EXPORTS = LD_OPTIONS
+MERGE_DIRS_isa-extra = $(libdir)
-EXTRA_MERGE_EXCLUDE_FILES = .*/perllocal.pod
+# Overriding specific libs is not possible right now. Refine when finished.
+# CHECKPKG_OVERRIDES_CSWnetsnmp = symbol-not-found|opt/csw/lib/python/site-packages/netsnmp/client_intf.so
+CHECKPKG_OVERRIDES_CSWnetsnmp = symbol-not-found
+CHECKPKG_OVERRIDES_CSWnetsnmp += missing-dependency|CSWperl
include gar/category.mk
post-install-isa-sparcv8:
- @( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(DESTDIR)/../../$(FILEDIR)/old_libs_s.tar.gz |tar xf -)
- @ln -s libnetsnmp.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmp.so.10
- @ln -s libnetsnmpagent.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpagent.so.10
- @ln -s libnetsnmphelpers.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmphelpers.so.10
- @ln -s libnetsnmpmibs.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpmibs.so.10
- @ln -s libnetsnmptrapd.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmptrapd.so.10
+ ( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(DESTDIR)/../../$(FILEDIR)/old_libs_s.tar.gz |tar xf -)
+ ln -s libnetsnmp.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmp.so.10
+ ln -s libnetsnmpagent.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpagent.so.10
+ ln -s libnetsnmphelpers.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmphelpers.so.10
+ ln -s libnetsnmpmibs.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpmibs.so.10
+ ln -s libnetsnmptrapd.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmptrapd.so.10
+ @$(MAKECOOKIE)
post-install-isa-i386:
- @( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(DESTDIR)/../../$(FILEDIR)/old_libs_i.tar.gz |tar xf -)
- @ln -s libnetsnmp.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmp.so.10
- @ln -s libnetsnmpagent.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpagent.so.10
- @ln -s libnetsnmphelpers.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmphelpers.so.10
- @ln -s libnetsnmpmibs.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpmibs.so.10
+ ( cd $(INSTALLISADIR)$(libdir) ; gzip -dc $(DESTDIR)/../../$(FILEDIR)/old_libs_i.tar.gz |tar xf -)
+ ln -s libnetsnmp.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmp.so.10
+ ln -s libnetsnmpagent.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpagent.so.10
+ ln -s libnetsnmphelpers.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmphelpers.so.10
+ ln -s libnetsnmpmibs.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmpmibs.so.10
@ln -s libnetsnmptrapd.so.10.0.1 $(INSTALLISADIR)$(libdir)/libnetsnmptrapd.so.10
+ @$(MAKECOOKIE)
Modified: csw/mgar/pkg/netsnmp/trunk/checksums
===================================================================
--- csw/mgar/pkg/netsnmp/trunk/checksums 2010-02-25 16:02:24 UTC (rev 8823)
+++ csw/mgar/pkg/netsnmp/trunk/checksums 2010-02-25 16:03:16 UTC (rev 8824)
@@ -1,3 +1,3 @@
5e0ec3e4d3dd363437d85eca6b91951a Makefile.in.diff
5b2551e7bd024fbbee84dca22a5f13a1 net-snmp-5.5.tar.gz
-01897895a960cd9cafbf2457c1aff065 perl_makefiles.diff
+c64f189decc111ba83c28f135bf96a9b perl_makefiles.diff
Modified: csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff
===================================================================
--- csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff 2010-02-25 16:02:24 UTC (rev 8823)
+++ csw/mgar/pkg/netsnmp/trunk/files/perl_makefiles.diff 2010-02-25 16:03:16 UTC (rev 8824)
@@ -5,7 +5,7 @@
$lib_version = `$opts->{'nsconfig'} --version`;
if (lc($opts->{'insource'}) eq "true") {
-+ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ " . "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
++ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib -lperl $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
$Params{'LIBS'} = "-L../../snmplib/.libs -L../../snmplib/ " . $Params{'LIBS'};
$Params{'CCFLAGS'} = "-I../../include " . $Params{'CCFLAGS'};
}
@@ -16,7 +16,7 @@
$Params{'CCFLAGS'} .= " " . $Config{'ccflags'};
$lib_version = `$opts->{'nsconfig'} --version`;
if (lc($opts->{'insource'}) eq "true") {
-+ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ " . "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
++ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib -lperl $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
$Params{'LIBS'} = "-L../../snmplib/.libs -L../../snmplib/ " . $Params{'LIBS'};
$Params{'CCFLAGS'} = "-I../../include " . $Params{'CCFLAGS'};
# } else {
@@ -27,7 +27,7 @@
}
$lib_version = `$opts->{'nsconfig'} --version`;
if (lc($opts->{'insource'}) eq "true") {
-+ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ " . "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
++ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib -lperl $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
$Params{'LIBS'} = "-L../../snmplib/.libs -L../../snmplib/ " . $Params{'LIBS'};
$Params{'CCFLAGS'} = "-I../../include " . $Params{'CCFLAGS'};
# } else {
@@ -38,7 +38,7 @@
}
if (lc($opts->{'insource'}) eq "true") {
-+ $Params{'LDDLFLAGS'} = "-L../../apps/.libs -L../../apps -L../../agent/.libs -L../../agent -L../../agent/helpers/.libs -L../../agent/helpers -L../../snmplib/.libs -L../../snmplib " . "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
++ $Params{'LDDLFLAGS'} = "-L../../apps/.libs -L../../apps -L../../agent/.libs -L../../agent -L../../agent/helpers/.libs -L../../agent/helpers -L../../snmplib/.libs -L../../snmplib -L/opt/csw/lib -lperl $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
$Params{'LIBS'} = "-L../../apps/.libs -L../../apps -L../../agent/.libs -L../../agent -L../../agent/helpers/.libs -L../../agent/helpers -L../../snmplib/.libs -L../../snmplib " . $Params{'LIBS'};
$Params{'CCFLAGS'} = "-I../../include " . $Params{'CCFLAGS'};
} else {
@@ -49,7 +49,7 @@
$Params{'CCFLAGS'} .= " " . $Config{'ccflags'};
$lib_version = `$opts->{'nsconfig'} --version`;
if (lc($opts->{'insource'}) eq "true") {
-+ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L../../agent/.libs -L../../agent/ -L../../agent/helpers/.libs -L../../agent/helpers/ " . "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
++ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L../../agent/.libs -L../../agent/ -L../../agent/helpers/.libs -L../../agent/helpers/ -L/opt/csw/lib -lperl $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
$Params{'LIBS'} = "-L../../snmplib/.libs -L../../snmplib/ -L../../agent/.libs -L../../agent/ -L../../agent/helpers/.libs -L../../agent/helpers/ " . $Params{'LIBS'};
$Params{'CCFLAGS'} = "-I../../include " . $Params{'CCFLAGS'};
# } else {
@@ -60,7 +60,7 @@
$Params{'CCFLAGS'} .= " " . $Config{'ccflags'};
$lib_version = `$opts->{'nsconfig'} --version`;
if (lc($opts->{'insource'}) eq "true") {
-+ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ " . "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
++ $Params{'LDDLFLAGS'} = "-L../../snmplib/.libs -L../../snmplib/ -L/opt/csw/lib -lperl $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
$Params{'LIBS'} = "-L../../snmplib/.libs -L../../snmplib/ " . $Params{'LIBS'};
$Params{'CCFLAGS'} = "-I../../include " . $Params{'CCFLAGS'};
}
@@ -70,7 +70,7 @@
}
else {
$opts = NetSNMPGetOpts("../../");
-+ $Params{'LDDLFLAGS'} = "$Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
++ $Params{'LDDLFLAGS'} = "-L/opt/csw/lib -lperl $Config{lddlflags} " . `$opts->{'nsconfig'} --ldflags`;
$Params{'LIBS'} = `$opts->{'nsconfig'} --libs`;
chomp($Params{'LIBS'});
$Params{'CCFLAGS'} = `$opts->{'nsconfig'} --cflags`;
@@ -78,7 +78,7 @@
$Params{'CCFLAGS'} .= " " . $Config{'ccflags'};
$lib_version = `$opts->{'nsconfig'} --version`;
if ($opts->{'insource'} eq "true") {
-+ $Params{'LDDLFLAGS'} = "-L../../../snmplib/.libs -L../../../snmplib/ " . $Params{'LDDLFLAGS'};
++ $Params{'LDDLFLAGS'} = "-L../../../snmplib/.libs -L../../../snmplib/ -L/opt/csw/lib -lperl " . $Params{'LDDLFLAGS'};
$Params{'LIBS'} = "-L../../../snmplib/.libs -L../../../snmplib/ " . $Params{'LIBS'};
$Params{'CCFLAGS'} = "-I../../../include " . $Params{'CCFLAGS'};
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list