diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2013-12-14 00:23:33 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2013-12-14 00:44:03 +0400 |
| commit | 455f7a9dd68b3422420a7f9580764f238dfbd562 (patch) | |
| tree | c7c963dc8d9871425f7e6bf585681d0585bae9ce | |
| parent | 351bfa880af4bf32eaeaad3440ec981bb988cebc (diff) | |
| download | pkg-net-snmp-455f7a9dd68b3422420a7f9580764f238dfbd562.tar.gz | |
Build conflicts with libadm-dev (we are not solaris)
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/control | 3 | ||||
| -rw-r--r-- | debian/patches/dyson-embedperl.patch | 28 |
3 files changed, 32 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index ae007c9..9ae4d9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ net-snmp (5.7.2~dfsg-8+dyson1) UNRELEASED; urgency=low * Build depends on libkstat-dev [illumos-any kopensolaris-any] * No procps on illumos * Need libelf on illumos + * Build conflicts with libadm-dev [illumos-any kopensolaris-any] + (we are not solaris) -- Igor Pashev <pashev.igor@gmail.com> Fri, 13 Dec 2013 23:25:17 +0400 diff --git a/debian/control b/debian/control index 7a0f860..e7aa508 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,8 @@ Build-Depends: debhelper (>= 9), libtool, libwrap0-dev, libssl-dev (>> 0.9.8), p libelfg0-dev [illumos-any kopensolaris-any] | libelf-dev [illumos-any kopensolaris-any], libsensors4-dev [linux-any], libmysqld-dev -Build-Conflicts: libsnmp-dev +Build-Conflicts: libsnmp-dev, + libadm-dev [illumos-any kopensolaris-any], Standards-Version: 3.9.4 Vcs-Git: git://anonscm.debian.org/pkg-net-snmp/pkg-net-snmp.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-net-snmp/pkg-net-snmp.git diff --git a/debian/patches/dyson-embedperl.patch b/debian/patches/dyson-embedperl.patch new file mode 100644 index 0000000..010be32 --- /dev/null +++ b/debian/patches/dyson-embedperl.patch @@ -0,0 +1,28 @@ +Index: pkg-net-snmp/configure.d/config_project_perl_python +=================================================================== +--- pkg-net-snmp.orig/configure.d/config_project_perl_python 2013-12-13 23:13:56.459889197 +0400 ++++ pkg-net-snmp/configure.d/config_project_perl_python 2013-12-14 00:29:36.777131641 +0400 +@@ -157,23 +157,6 @@ + # System-specific requirements + # + case $target_os in +- solaris*) +- if test "x$embed_perl" != "xno" ; then +- # Check for LARGEFILE support (Solaris) +- # +- AC_MSG_CHECKING([for problematic Perl cc flags on Suns]) +- if $myperl -V:ccflags | $GREP LARGEFILE > /dev/null ; then +- if test "x$embed_perl" = "xtry" ; then +- embed_perl="no" +- else +- AC_MSG_ERROR([Perl was compiled with LARGEFILE support which will break Net-SNMP. Either set the environment variable PERLPROG to a different perl binary or use --disable-embedded-perl to turn off embedded Perl functionality altogether.]) +- fi +- else +- AC_MSG_RESULT([none known]) +- fi +- fi +- ;; +- + # Embedded perl typically fails on HP-UX and Mac OS X + # We really need to investigate why, and check for this explicitly + # But for the time being, turn this off by default |