Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/net-snmp/patches/011.Makefile.in.patch
author Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
Wed, 22 Jan 2014 01:46:00 -0800
changeset 1650 ce501c11d5fa
parent 1306 11b376b53ac1
child 1679 51291a5fd692
permissions -rw-r--r--
15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1650
ce501c11d5fa 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents: 1306
diff changeset 
     1
 
#
ce501c11d5fa 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents: 1306
diff changeset 
     2
 
# The Net-SNMP libraries are built without -zdefs and are missing a large
ce501c11d5fa 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents: 1306
diff changeset 
     3
 
# number of dependency specifications (DT_NEEDED).  This makes it
ce501c11d5fa 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents: 1306
diff changeset 
     4
 
# impossible to build plugin modules against these libraries using
ce501c11d5fa 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents: 1306
diff changeset 
     5
 
# -zdefs, which should work. One such example is FMA in ON gate.
ce501c11d5fa 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents: 1306
diff changeset 
     6
 
#
ce501c11d5fa 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents: 1306
diff changeset 
     7
 
--- net-snmp-5.7.2/agent/Makefile.in	Tue Oct  9 15:28:58 2012
ce501c11d5fa 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents: 1306
diff changeset 
     8
 
+++ net-snmp-5.7.2/agent/Makefile.in	Sun Dec 30 23:58:44 2012
ce501c11d5fa 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents: 1306
diff changeset 
     9
 
@@ -274,9 +274,13 @@
252
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    10
 
 LOBJS		= $(LLIBAGENTOBJS) $(LAGENTOBJS) mib_modules.lo auto_nlist.lo
1650
ce501c11d5fa 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents: 1306
diff changeset 
    11
 
 FTOBJS		= $(LLIBAGENTFTS) $(FTAGENTOBJS) mib_modules.ft auto_nlist.ft
252
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    12
1650
ce501c11d5fa 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents: 1306
diff changeset 
    13
 
+LIB_LD_ADD_AGENT   =-lnetsnmp -lnetsnmphelpers
ce501c11d5fa 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents: 1306
diff changeset 
    14
 
+
ce501c11d5fa 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents: 1306
diff changeset 
    15
 
+LIB_LD_ADD_PATH_MIBS   =-Lhelpers -L../snmplib
ce501c11d5fa 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents: 1306
diff changeset 
    16
 
+
ce501c11d5fa 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents: 1306
diff changeset 
    17
 
 FEATUREFILE     = $(top_builddir)/include/net-snmp/agent/features.h
252
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    18
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    19
 
-all: agentlib subdirs miblib $(INSTALLBINPROGS) $(INSTALLSBINPROGS)
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    20
 
+all: agentlib subdirs miblib relinklib $(INSTALLBINPROGS) $(INSTALLSBINPROGS)
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    21
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    22
 
 #
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    23
 
 # build stuff targets
1650
ce501c11d5fa 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents: 1306
diff changeset 
    24
 
@@ -306,6 +310,10 @@
252
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    25
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    26
 
 agentlib: $(AGENTLIB)
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    27
1650
ce501c11d5fa 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents: 1306
diff changeset 
    28
 
+relinklib:	${LLIBAGENTOBJS} $(USELIBS)
252
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    29
 
+	$(LIB_LD_CMD) $(AGENTLIB) $(LIB_LD_ADD_PATH_MIBS) ${LLIBAGENTOBJS} $(USELIBS) ${LAGENTLIBS} $(LDFLAGS) $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS) $(LIB_LD_ADD_AGENT)
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    30
 
+	$(RANLIB) $(AGENTLIB) $(LIB_LD_ADD_AGENT)
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    31
 
+
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    32
 
 miblib: $(MIBLIB)
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    33
1650
ce501c11d5fa 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents: 1306
diff changeset 
    34
 
 libs: $(AGENTLIB) $(MIBLIB)
ce501c11d5fa 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents: 1306
diff changeset 
    35
 
--- net-snmp-5.7.2/agent/helpers/Makefile.in	Sun Dec 30 22:37:05 2012
ce501c11d5fa 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents: 1306
diff changeset 
    36
 
+++ net-snmp-5.7.2/agent/helpers/Makefile.in	Mon Dec 31 00:02:37 2012
ce501c11d5fa 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents: 1306
diff changeset 
    37
 
@@ -31,8 +31,11 @@
ce501c11d5fa 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents: 1306
diff changeset 
    38
ce501c11d5fa 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents: 1306
diff changeset 
    39
 
 LOBJS = dummy.lo
252
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    40
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    41
 
+LIB_LD_ADD	=-lnetsnmp
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    42
 
+LIB_LD_ADD_PATH	=-L../../snmplib
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    43
 
+
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    44
 
 all: standardall
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    45
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    46
 
 libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION):    $(LOBJS)
1650
ce501c11d5fa 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents: 1306
diff changeset 
    47
 
-	$(LIB_LD_CMD) $@ $(LOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) $(LIB_LD_LIBS)
252
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    48
 
-	$(RANLIB) $@
1650
ce501c11d5fa 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents: 1306
diff changeset 
    49
 
+	$(LIB_LD_CMD) $@ $(LIB_LD_ADD_PATH) $(LOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) $(LIB_LD_LIBS) $(LIB_LD_ADD)
252
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    50
 
+	$(RANLIB) $@ $(LIB_LD_ADD)
1650
ce501c11d5fa 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents: 1306
diff changeset 
    51
 
--- net-snmp-5.7.2/snmplib/Makefile.in	Sun Dec 30 22:37:08 2012
ce501c11d5fa 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents: 1306
diff changeset 
    52
 
+++ net-snmp-5.7.2/agent/helpers/Makefile.in	Mon Dec 31 00:06:01 2012
ce501c11d5fa 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents: 1306
diff changeset 
    53
 
@@ -221,6 +221,9 @@
252
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    54
 
 # just in case someone wants to remove libtool, change this to OBJS.
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    55
 
 TOBJS=$(LOBJS)
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    56
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    57
 
+# To satisfy -zdefs
1650
ce501c11d5fa 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents: 1306
diff changeset 
    58
 
+LIB_LD_ADD =-lnsl -lsocket -L$(libdir)
252
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    59
 
+
1650
ce501c11d5fa 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents: 1306
diff changeset 
    60
 
 FEATUREFILE     = $(top_builddir)/include/net-snmp/library/features.h
ce501c11d5fa 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents: 1306
diff changeset 
    61
1306
11b376b53ac1 backout 16488880/15685782/15997718/15705167/15754602/16003771/16242256 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 1301
diff changeset 
    62
 
 #
1650
ce501c11d5fa 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents: 1306
diff changeset 
    63
 
@@ -230,8 +233,8 @@
252
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    64
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    65
 
 # how to build the libraries.
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    66
 
 libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    $(TOBJS)
1650
ce501c11d5fa 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents: 1306
diff changeset 
    67
 
-	$(LIB_LD_CMD) $@ $(TOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) @LNETSNMPLIBS@
252
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    68
 
-	$(RANLIB) $@
1650
ce501c11d5fa 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents: 1306
diff changeset 
    69
 
+	$(LIB_LD_CMD) $@ $(TOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) @LNETSNMPLIBS@ } $(LIB_LD_ADD)
ce501c11d5fa 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents: 1306
diff changeset 
    70
 
+	$(RANLIB) $@ $(LIB_LD_ADD)
252
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    71
ee0fb1eabcbf 7041085 move net-snmp to userland
gowtham thommandra - Sun Microsystems - Bangalore India <Gowtham.Thommandra@Sun.COM>
parents:
diff changeset 
    72
 
 libsnmp.$(LIB_EXTENSION)$(LIB_VERSION):    $(TOBJS)
1650
ce501c11d5fa 15685782 SUNBT7005330 NET-SNMP upgrade to latest stable version
Gowtham Thommandra <Gowtham.Thommandra@Oracle.COM>
parents: 1306
diff changeset 
    73
 
 	$(LIB_LD_CMD) $@ $(TOBJS) @LD_NO_UNDEFINED@ $(LDFLAGS) @LNETSNMPLIBS@
upstream/oracle/userland-gate