← Back to branch summary

~ubuntu-branches/ubuntu/wily/net-snmp/wily-proposed

« back to all changes in this revision

Viewing changes to debian/patches/62_add_lib_cflags.patch

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-06-28 14:59:36 UTC
  • mfrom: (1.2.3 upstream) (1.1.12 sid)
  • Revision ID: james.westby@ubuntu.com-20100628145936-cbiallic69pn044g
Tags: 5.4.3~dfsg-1ubuntu1
https://launchpad.net/bugs/104738
https://launchpad.net/bugs/254261
https://launchpad.net/bugs/250459
https://launchpad.net/bugs/589056
https://launchpad.net/bugs/573391
https://launchpad.net/bugs/533603
* Merge from debian unstable.  Remaining changes:
  - Set Ubuntu maintainer address.
  - net-snmp-config: Use bash. (LP: #104738)
  - Removed multiuser option when calling update-rc.d. (LP: #254261)
  - debian/snmpd.init: LSBify the init script.
  - debian/patches/52_fix_snmpcmd_1_typo.patch: Adjust a typo in snmpcmd.1
    (LP: #250459)
  - debian/snmpd.postinst: source debconf before doing work, LP: #589056
  - debian/snmp.preinst, debian/snmp.prerm: kill any/all processes owned by
    snmp user before install/uninstall, LP: #573391
  - Add apport hook (LP: #533603):
  - debian/{snmp,snmpd}.apport: Added.
  - debian/control: Build-depends on dh-apport.
  - debian/rules: 
    + Add --with apport.
    + override_dh_apport to install hook on snmpd package only.
 * Dropped patches:
   - debian/patches/99-fix-ubuntu-div0.patch: Fix dvision by zero.. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/62_add_lib_cflags.patch
 
1
Index: net-snmp-5.4.2.1/configure.in
 
2
===================================================================
 
3
--- net-snmp-5.4.2.1.orig/configure.in  2009-12-01 17:30:39.000000000 +0100
 
4
+++ net-snmp-5.4.2.1/configure.in       2009-12-01 17:30:40.000000000 +0100
 
5
@@ -3050,6 +3050,10 @@
 
6
   fi
 
7
 fi
 
8
 
 
9
+# Save CFLAGS for net-snmp-config
 
10
+LIBCFLAGS="$CFLAGS"
 
11
+AC_SUBST(LIBCFLAGS)
 
12
+
 
13
 ####################
 
14
 # on to embedding...
 
15
 
 
16
Index: net-snmp-5.4.2.1/net-snmp-config.in
 
17
===================================================================
 
18
--- net-snmp-5.4.2.1.orig/net-snmp-config.in    2009-12-01 17:30:12.000000000 +0100
 
19
+++ net-snmp-5.4.2.1/net-snmp-config.in 2009-12-01 17:31:16.000000000 +0100
 
20
@@ -107,6 +107,9 @@
 
21
     --base-cflags)
 
22
       echo @CFLAGS@ @CPPFLAGS@ -I${NSC_INCLUDEDIR}
 
23
       ;;
 
24
+    --base-lib-cflags)
 
25
+      echo @LIBCFLAGS@ @CPPFLAGS@ -I${NSC_INCLUDEDIR}
 
26
+      ;;
 
27
     --cflags|--cf*)
 
28
       echo @CFLAGS@ @DEVFLAGS@ @CPPFLAGS@ -I. -I${NSC_INCLUDEDIR}
 
29
       ;;
 
30
@@ -684,6 +687,8 @@
 
31
   echo "  These options produce the various compilation flags needed when"
 
32
   echo "  building external SNMP applications:"
 
33
   echo ""
 
34
+  echo "    --base-lib-cflags lists additional compilation flags needed for linking"
 
35
+  echo "                      against libsnmp"
 
36
   echo "    --base-cflags     lists additional compilation flags needed"
 
37
   echo "    --cflags          lists additional compilation flags needed"
 
38
   echo "                      (includes -I. and extra developer warning flags)"