[Pkg-net-snmp-commits] r284 - branches/net-snmp54/debian/patches

[Jochen Friedrich]

Author: jochen
Date: 2009-11-03 16:48:10 +0000 (Tue, 03 Nov 2009)
New Revision: 284

Modified:
   branches/net-snmp54/debian/patches/03_makefiles.patch
Log:
Change top level Makefile to get rid of RPATH sections in generated perl libraries.
Refresh 03_makefiles.patch 


Modified: branches/net-snmp54/debian/patches/03_makefiles.patch
===================================================================
--- branches/net-snmp54/debian/patches/03_makefiles.patch	2009-11-03 16:43:57 UTC (rev 283)
+++ branches/net-snmp54/debian/patches/03_makefiles.patch	2009-11-03 16:48:10 UTC (rev 284)
@@ -1,6 +1,7 @@
-diff -ruN net-snmp-5.4.2.1.orig/local/Makefile.in net-snmp-5.4.2.1/local/Makefile.in
---- net-snmp-5.4.2.1.orig/local/Makefile.in	2008-03-21 18:22:57.000000000 +0100
-+++ net-snmp-5.4.2.1/local/Makefile.in	2009-08-01 22:12:22.000000000 +0200
+Index: net-snmp-5.4.2.1/local/Makefile.in
+===================================================================
+--- net-snmp-5.4.2.1.orig/local/Makefile.in	2009-11-03 15:24:11.000000000 +0100
++++ net-snmp-5.4.2.1/local/Makefile.in	2009-11-03 15:25:09.000000000 +0100
 @@ -100,7 +100,7 @@
  
  mib2c.made: $(srcdir)/mib2c
@@ -10,9 +11,10 @@
  	else \
  	  touch mib2c.made; \
          fi
-diff -ruN net-snmp-5.4.2.1.orig/Makefile.top net-snmp-5.4.2.1/Makefile.top
---- net-snmp-5.4.2.1.orig/Makefile.top	2008-10-31 16:20:48.000000000 +0100
-+++ net-snmp-5.4.2.1/Makefile.top	2009-08-01 22:12:22.000000000 +0200
+Index: net-snmp-5.4.2.1/Makefile.top
+===================================================================
+--- net-snmp-5.4.2.1.orig/Makefile.top	2009-11-03 15:24:11.000000000 +0100
++++ net-snmp-5.4.2.1/Makefile.top	2009-11-03 15:25:09.000000000 +0100
 @@ -26,6 +26,7 @@
  snmplibdir	= $(datadir)/snmp
  mibdir		= $(snmplibdir)/mibs
@@ -21,9 +23,10 @@
  DESTDIR         = @INSTALL_PREFIX@
  INSTALL_PREFIX  = $(DESTDIR)
  
-diff -ruN net-snmp-5.4.2.1.orig/mibs/Makefile.in net-snmp-5.4.2.1/mibs/Makefile.in
---- net-snmp-5.4.2.1.orig/mibs/Makefile.in	2008-08-18 21:05:38.000000000 +0200
-+++ net-snmp-5.4.2.1/mibs/Makefile.in	2009-08-01 22:12:42.000000000 +0200
+Index: net-snmp-5.4.2.1/mibs/Makefile.in
+===================================================================
+--- net-snmp-5.4.2.1.orig/mibs/Makefile.in	2009-11-03 15:24:11.000000000 +0100
++++ net-snmp-5.4.2.1/mibs/Makefile.in	2009-11-03 15:25:09.000000000 +0100
 @@ -13,57 +13,30 @@
  OTHERUNINSTALL=mibsuninstall
  
@@ -90,9 +93,10 @@
  		rm -f $(INSTALL_PREFIX)$(mibdir)/$$i ; \
  		echo "removed $$i from $(INSTALL_PREFIX)$(mibdir)" ; \
  	done
-diff -ruN net-snmp-5.4.2.1.orig/mibs/Makefile.mib net-snmp-5.4.2.1/mibs/Makefile.mib
---- net-snmp-5.4.2.1.orig/mibs/Makefile.mib	2008-08-17 23:29:11.000000000 +0200
-+++ net-snmp-5.4.2.1/mibs/Makefile.mib	2009-08-01 22:12:39.000000000 +0200
+Index: net-snmp-5.4.2.1/mibs/Makefile.mib
+===================================================================
+--- net-snmp-5.4.2.1.orig/mibs/Makefile.mib	2009-11-03 15:24:11.000000000 +0100
++++ net-snmp-5.4.2.1/mibs/Makefile.mib	2009-11-03 15:25:09.000000000 +0100
 @@ -5,9 +5,9 @@
  IANAHOST =	http://www.iana.org
  IANADIR =	assignments
@@ -115,3 +119,16 @@
  	./mibfetch $(RFCHOST) $(RFCDIR) 3873
  
  ianamibs:	ianalist
+Index: net-snmp-5.4.2.1/Makefile.in
+===================================================================
+--- net-snmp-5.4.2.1.orig/Makefile.in	2009-11-03 15:27:14.000000000 +0100
++++ net-snmp-5.4.2.1/Makefile.in	2009-11-03 15:27:43.000000000 +0100
+@@ -156,7 +156,7 @@
+ #
+ # override LD_RUN_PATH to avoid dependencies on the build directory
+ perlmodules: perlmakefiles subdirs
+-	@(cd perl ; $(MAKE) LD_RUN_PATH="$(libdir):`$(PERL) -e 'use Config; print qq($$Config{archlibexp}/CORE);'`") ; \
++	@(cd perl ; $(MAKE) LD_RUN_PATH="") ; \
+         if test $$? != 0 ; then \
+            exit 1 ; \
+         fi