[Pkg-irc-commits] r30 - /packages/inspircd/trunk/debian/patches/01_rpath.dpatch

dblaber-guest at users.alioth.debian.org dblaber-guest at users.alioth.debian.org
Sun Dec 9 21:37:04 UTC 2007


Author: dblaber-guest
Date: Sun Dec  9 21:37:04 2007
New Revision: 30

URL: http://svn.debian.org/wsvn/pkg-irc/?sc=1&rev=30
Log:
Update the rpath patch for the new version

Modified:
    packages/inspircd/trunk/debian/patches/01_rpath.dpatch

Modified: packages/inspircd/trunk/debian/patches/01_rpath.dpatch
URL: http://svn.debian.org/wsvn/pkg-irc/packages/inspircd/trunk/debian/patches/01_rpath.dpatch?rev=30&op=diff
==============================================================================
--- packages/inspircd/trunk/debian/patches/01_rpath.dpatch (original)
+++ packages/inspircd/trunk/debian/patches/01_rpath.dpatch Sun Dec  9 21:37:04 2007
@@ -1,22 +1,23 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_rpath.dpatch by Mario Iseli <mario at debian.org>
+## 01_rpath.dpatch by  <dmb at alpha.lan>
 ##
-## DP: Remove the -Wl,--rpath stuff from the configure script.
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
 
 @DPATCH@
-diff -urNad inspircd-1.1.8~/configure inspircd-1.1.8/configure
---- inspircd-1.1.8~/configure	2007-10-07 12:43:56.000000000 +0200
-+++ inspircd-1.1.8/configure	2007-10-07 12:44:58.000000000 +0200
-@@ -881,7 +881,7 @@
+diff -urNad inspircd-1.1.15~/configure inspircd-1.1.15/configure
+--- inspircd-1.1.15~/configure	2007-12-09 16:18:03.000000000 -0500
++++ inspircd-1.1.15/configure	2007-12-09 16:19:33.000000000 -0500
+@@ -964,7 +964,7 @@
  	$config{LDLIBS} = "-lstdc++";
- 	$config{FLAGS}  = "-fno-strict-aliasing -fPIC -Wall -Woverloaded-virtual $config{OPTIMISATI}";
- 	$config{DEVELOPER} = "-fno-strict-aliasing -fPIC -Wall -Woverloaded-virtual -g";
+ 	$config{FLAGS}  = "-fno-strict-aliasing -fPIC -Wall -Woverloaded-virtual -Wno-deprecated $config{OPTIMISATI}";
+ 	$config{DEVELOPER} = "-fno-strict-aliasing -fPIC -Wall -Woverloaded-virtual -Wno-deprecated -g";
 -	$SHARED = "-Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared";
 +	$SHARED = "-shared";
  	$config{MAKEPROG} = "make";
  
  	if ($config{OSNAME} =~ /darwin/i) {
-@@ -969,7 +969,7 @@
+@@ -1058,7 +1058,7 @@
  #define CoreExport /**/
  #define DllExport /**/
  
@@ -25,123 +26,123 @@
  #define MOD_PATH "$config{MODULE_DIR}"
  #define VERSION "$version"
  #define REVISION "$revision2"
-@@ -1681,96 +1681,96 @@
+@@ -1793,96 +1793,96 @@
  all: libIRCDtimer.so libIRCDcull_list.so libIRCDuserprocess.so libIRCDsocketengine.so libIRCDsocket.so libIRCDhash.so libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDconfigreader.so libIRCDinspsocket.so $cmdobjs libIRCDcommands.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDcommand_parse.so libIRCDsnomasks.so inspircd
  
  inspircd: inspircd.cpp ../include/base.h ../include/channels.h ../include/inspircd.h ../include/channels.h ../include/globals.h ../include/inspircd_config.h ../include/socket.h libIRCDtimer.so libIRCDcull_list.so libIRCDuserprocess.so libIRCDsocketengine.so libIRCDsocket.so libIRCDhash.so libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDconfigreader.so libIRCDinspsocket.so $cmdobjs libIRCDsnomasks.so libIRCDcommands.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDcommand_parse.so
--	\$(CC) -pipe -I../include $extra -Wl,--rpath -Wl,$config{LIBRARY_DIR} \$(FLAGS) -rdynamic -L. inspircd.cpp -o inspircd \$(LDLIBS) libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDconfigreader.so libIRCDinspsocket.so libIRCDcommands.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDhash.so libIRCDsocket.so libIRCDsocketengine.so libIRCDuserprocess.so libIRCDcull_list.so libIRCDcommand_parse.so libIRCDtimer.so libIRCDsnomasks.so
-+	\$(CC) -pipe -I../include $extra \$(FLAGS) -rdynamic -L. inspircd.cpp -o inspircd \$(LDLIBS) libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDconfigreader.so libIRCDinspsocket.so libIRCDcommands.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDhash.so libIRCDsocket.so libIRCDsocketengine.so libIRCDuserprocess.so libIRCDcull_list.so libIRCDcommand_parse.so libIRCDtimer.so libIRCDsnomasks.so
+-	\$(CC) -pipe -I../include $extra -Wl,--rpath -Wl,$config{LIBRARY_DIR} \$(FLAGS) $freebsd4libs -rdynamic -L. inspircd.cpp -o inspircd \$(LDLIBS) libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDconfigreader.so libIRCDinspsocket.so libIRCDcommands.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDhash.so libIRCDsocket.so libIRCDsocketengine.so libIRCDuserprocess.so libIRCDcull_list.so libIRCDcommand_parse.so libIRCDtimer.so libIRCDsnomasks.so
++	\$(CC) -pipe -I../include $extra  \$(FLAGS) $freebsd4libs -rdynamic -L. inspircd.cpp -o inspircd \$(LDLIBS) libIRCDchannels.so libIRCDmode.so libIRCDxline.so libIRCDstring.so libIRCDasyncdns.so libIRCDbase.so libIRCDconfigreader.so libIRCDinspsocket.so libIRCDcommands.so libIRCDdynamic.so libIRCDusers.so libIRCDmodules.so libIRCDwildcard.so libIRCDhelper.so libIRCDhash.so libIRCDsocket.so libIRCDsocketengine.so libIRCDuserprocess.so libIRCDcull_list.so libIRCDcommand_parse.so libIRCDtimer.so libIRCDsnomasks.so
  
  libIRCDsocketengine.so: $se.cpp socketengine.cpp ../include/base.h ../include/hashcomp.h ../include/globals.h ../include/inspircd_config.h ../include/$se.h
  	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c socketengine.cpp $se.cpp
 -	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDsocketengine.so socketengine.o $se.o
-+	\$(CC) -pipe -shared -o libIRCDsocketengine.so socketengine.o $se.o
++	\$(CC) -pipe  -shared -o libIRCDsocketengine.so socketengine.o $se.o
  
  libIRCDsnomasks.so: snomasks.cpp ../include/base.h ../include/hashcomp.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/channels.h
  	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c snomasks.cpp
 -	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDsnomasks.so snomasks.o
-+	\$(CC) -pipe -shared -o libIRCDsnomasks.so snomasks.o
++	\$(CC) -pipe  -shared -o libIRCDsnomasks.so snomasks.o
  
  libIRCDcommand_parse.so: command_parse.cpp ../include/base.h ../include/hashcomp.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
  	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c command_parse.cpp
 -	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDcommand_parse.so command_parse.o
-+	\$(CC) -pipe -shared -o libIRCDcommand_parse.so command_parse.o
++	\$(CC) -pipe  -shared -o libIRCDcommand_parse.so command_parse.o
  
  libIRCDcull_list.so: cull_list.cpp ../include/base.h ../include/hashcomp.h ../include/globals.h ../include/inspircd_config.h ../include/users.h ../include/channels.h
  	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c cull_list.cpp
 -	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDcull_list.so cull_list.o
-+	\$(CC) -pipe -shared -o libIRCDcull_list.so cull_list.o
++	\$(CC) -pipe  -shared -o libIRCDcull_list.so cull_list.o
  
  libIRCDuserprocess.so: userprocess.cpp ../include/base.h ../include/hashcomp.h ../include/globals.h ../include/inspircd_config.h
  	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c userprocess.cpp
 -	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDuserprocess.so userprocess.o
-+	\$(CC) -pipe -shared -o libIRCDuserprocess.so userprocess.o
++	\$(CC) -pipe  -shared -o libIRCDuserprocess.so userprocess.o
  
  libIRCDhash.so: hashcomp.cpp ../include/base.h ../include/hashcomp.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
  	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c hashcomp.cpp
 -	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDhash.so hashcomp.o
-+	\$(CC) -pipe -shared -o libIRCDhash.so hashcomp.o
++	\$(CC) -pipe  -shared -o libIRCDhash.so hashcomp.o
  
  libIRCDhelper.so: helperfuncs.cpp ../include/base.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
  	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c helperfuncs.cpp
 -	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDhelper.so helperfuncs.o
-+	\$(CC) -pipe -shared -o libIRCDhelper.so helperfuncs.o
++	\$(CC) -pipe  -shared -o libIRCDhelper.so helperfuncs.o
  
  libIRCDchannels.so: channels.cpp ../include/base.h ../include/channels.h ../include/inspircd.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
  	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c channels.cpp
 -	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDchannels.so channels.o
-+	\$(CC) -pipe -shared -o libIRCDchannels.so channels.o
++	\$(CC) -pipe  -shared -o libIRCDchannels.so channels.o
  
  libIRCDmode.so: mode.cpp ../include/base.h ../include/mode.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h \$(RELCPPFILES)
  	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c mode.cpp
  	\${MAKE} -C "modes" DIRNAME="src/modes" CC="\$(CC)" \$(MAKEARGS) CPPFILES="\$(CPPFILES)"
 -	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDmode.so mode.o modes/modeclasses.a
-+	\$(CC) -pipe -shared -o libIRCDmode.so mode.o modes/modeclasses.a
++	\$(CC) -pipe  -shared -o libIRCDmode.so mode.o modes/modeclasses.a
  
  libIRCDxline.so: xline.cpp ../include/base.h ../include/xline.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
  	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c xline.cpp
 -	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDxline.so xline.o
-+	\$(CC) -pipe -shared -o libIRCDxline.so xline.o
++	\$(CC) -pipe  -shared -o libIRCDxline.so xline.o
  
  libIRCDstring.so: inspstring.cpp ../include/base.h ../include/inspstring.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
  	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c inspstring.cpp
 -	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDstring.so inspstring.o
-+	\$(CC) -pipe -shared -o libIRCDstring.so inspstring.o
++	\$(CC) -pipe  -shared -o libIRCDstring.so inspstring.o
  
  libIRCDasyncdns.so: dns.cpp ../include/base.h ../include/dns.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
  	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c dns.cpp
 -	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDasyncdns.so dns.o
-+	\$(CC) -pipe -shared -o libIRCDasyncdns.so dns.o
++	\$(CC) -pipe  -shared -o libIRCDasyncdns.so dns.o
  
  libIRCDbase.so: base.cpp ../include/base.h ../include/globals.h ../include/inspircd_config.h
  	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c base.cpp
 -	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDbase.so base.o
-+	\$(CC) -pipe -shared -o libIRCDbase.so base.o
++	\$(CC) -pipe  -shared -o libIRCDbase.so base.o
  
  libIRCDconfigreader.so: configreader.cpp ../include/base.h ../include/configreader.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
  	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c configreader.cpp
 -	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDconfigreader.so configreader.o
-+	\$(CC) -pipe -shared -o libIRCDconfigreader.so configreader.o
++	\$(CC) -pipe  -shared -o libIRCDconfigreader.so configreader.o
  
  libIRCDcommands.so: commands.cpp ../include/base.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
  	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c commands.cpp
 -	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDcommands.so commands.o
-+	\$(CC) -pipe -shared -o libIRCDcommands.so commands.o
++	\$(CC) -pipe  -shared -o libIRCDcommands.so commands.o
  
  libIRCDdynamic.so: dynamic.cpp ../include/base.h ../include/dynamic.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
  	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c dynamic.cpp
 -	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDdynamic.so dynamic.o
-+	\$(CC) -pipe -shared -o libIRCDdynamic.so dynamic.o
++	\$(CC) -pipe  -shared -o libIRCDdynamic.so dynamic.o
  
  libIRCDusers.so: users.cpp ../include/base.h ../include/users.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
  	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c users.cpp
 -	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDusers.so users.o
-+	\$(CC) -pipe -shared -o libIRCDusers.so users.o
++	\$(CC) -pipe  -shared -o libIRCDusers.so users.o
  
  libIRCDmodules.so: modules.cpp ../include/base.h ../include/modules.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
  	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c modules.cpp
 -	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDmodules.so modules.o
-+	\$(CC) -pipe -shared -o libIRCDmodules.so modules.o
++	\$(CC) -pipe  -shared -o libIRCDmodules.so modules.o
  
  libIRCDwildcard.so: wildcard.cpp ../include/base.h ../include/wildcard.h ../include/inspircd.h ../include/channels.h ../include/users.h ../include/globals.h ../include/inspircd_config.h
  	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c wildcard.cpp
 -	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDwildcard.so wildcard.o
-+	\$(CC) -pipe -shared -o libIRCDwildcard.so wildcard.o
++	\$(CC) -pipe  -shared -o libIRCDwildcard.so wildcard.o
  
  libIRCDsocket.so: socket.cpp ../include/base.h ../include/inspircd.h ../include/globals.h ../include/inspircd_config.h
  	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c socket.cpp
 -	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDsocket.so socket.o
-+	\$(CC) -pipe -shared -o libIRCDsocket.so socket.o
++	\$(CC) -pipe  -shared -o libIRCDsocket.so socket.o
  
  libIRCDinspsocket.so: inspsocket.cpp ../include/base.h ../include/inspircd.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
  	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c inspsocket.cpp
 -	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDinspsocket.so inspsocket.o
-+	\$(CC) -pipe -shared -o libIRCDinspsocket.so inspsocket.o
++	\$(CC) -pipe  -shared -o libIRCDinspsocket.so inspsocket.o
  
  libIRCDtimer.so: timer.cpp ../include/base.h ../include/inspircd.h ../include/globals.h ../include/inspircd_config.h ../include/timer.h
  	\$(CC) -pipe -I../include \$(FLAGS) -export-dynamic -c timer.cpp
 -	\$(CC) -pipe -Wl,--rpath -Wl,$config{LIBRARY_DIR} -shared -o libIRCDtimer.so timer.o
-+	\$(CC) -pipe -shared -o libIRCDtimer.so timer.o
++	\$(CC) -pipe  -shared -o libIRCDtimer.so timer.o
  
  EOM
  }




More information about the Pkg-irc-commits mailing list