Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/DEV-capside/release-3.9.0:6365-6370
/branches/DEV-extra-notification-data:6734-6746
/branches/DEV-odw-calculations:9016-9160
/branches/DEV-snmp-multi:7324-7376
/branches/US187:9403-9479
/branches/US198b:8875-8994
/branches/enterprise/BRAN-3.14:6874,6882,6956
/branches/enterprise/DEV-professional:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571
/branches/us168:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
+ /branches/DEV-capside/release-3.9.0:6365-6370
/branches/DEV-extra-notification-data:6734-6746
/branches/DEV-odw-calculations:9016-9160
/branches/DEV-snmp-multi:7324-7376
/branches/US187:9403-9479
/branches/US198b:8875-8994
/branches/enterprise/BRAN-3.14:6874,6882,6956
/branches/enterprise/DEV-professional:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620
/branches/us168:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
Modified: trunk/opsview-base/Makefile
===================================================================
--- trunk/opsview-base/Makefile 2012-07-26 12:07:27 UTC (rev 9620)
+++ trunk/opsview-base/Makefile 2012-07-26 12:25:50 UTC (rev 9621)
@@ -560,6 +560,9 @@
# Have disabled below for the moment. Will be re-instated for single opsview-base work on ubuntu12
#cd ${NAGIOSPLUG} && rm perlmods/*.tar.gz && cp ../patches/nagios-plugins-perlmods/*.tar.gz perlmods
#cd ${NAGIOSPLUG} && patch -p1 < ../patches/nagiosplug_withbuildplsupport.patch
+ # Below added due to not being able to compile on Ubuntu12. This has an impact of using pm only for all agents on all platforms,
+ # but this is okay
+ cd ${NAGIOSPLUG} && patch -p1 < ../patches/nagios_plugins_params_validate_noxs.patch
if [ `uname -s` = Linux ] ; then \
cd ${NAGIOSPLUG} && PATH="/usr/bin:/usr/sbin:$$PATH" CFLAGS="${CFLAGS}" ./configure --with-mysql --with-nagios-user=$(NAGIOS_USER) --with-nagios-group=$(NAGIOS_GROUP) ${NAGIOSPLUG_CONFIGURE_PERL_MODULES} --localstatedir=/usr/local/nagios/var/plugins && make ; \
elif [ `uname -s` = Darwin ] ; then \
Copied: trunk/opsview-base/patches/nagios_plugins_params_validate_noxs.patch (from rev 9620, branches/enterprise/DEV-professional/opsview-base/patches/nagios_plugins_params_validate_noxs.patch)
===================================================================
--- trunk/opsview-base/patches/nagios_plugins_params_validate_noxs.patch (rev 0)
+++ trunk/opsview-base/patches/nagios_plugins_params_validate_noxs.patch 2012-07-26 12:25:50 UTC (rev 9621)
@@ -0,0 +1,20 @@
+diff -ur nagios-plugins-1.4.15/tools/build_perl_modules nagios-plugins-1.4.15.noxs/tools/build_perl_modules
+--- nagios-plugins-1.4.15/tools/build_perl_modules 2010-07-27 20:47:16.000000000 +0000
++++ nagios-plugins-1.4.15.noxs/tools/build_perl_modules 2012-07-26 12:02:56.294714659 +0000
+@@ -65,7 +65,15 @@
+ unless (-e $dir) {
+ system("gunzip -c $tarball | tar -xf -") == 0 or die "Cannot extract $tarball";
+ chdir $dir or die "Can't chdir into $dir";
+- system("perl Makefile.PL PREFIX=$destdir INSTALLDIRS=site LIB=$destdir/lib") == 0 or die "Can't run perl Makefile.PL";
++
++ my $extra_args = "";
++
++ # Hackity hack! Params::Validate has problems compiling xs on Ubuntu12. We disable XS compiling
++ if ($dir =~ /Params-Validate/) {
++ $extra_args = "--pm";
++ }
++
++ system("perl Makefile.PL PREFIX=$destdir INSTALLDIRS=site LIB=$destdir/lib $extra_args") == 0 or die "Can't run perl Makefile.PL";
+ system("make") == 0 or die "Can't run make";
+ chdir $topdir or die "Can't chdir to top";;
+ }
