diff options
Diffstat (limited to 'package/bitlbee/patches')
| -rw-r--r-- | package/bitlbee/patches/patch-Makefile | 22 | ||||
| -rw-r--r-- | package/bitlbee/patches/patch-configure | 1 | ||||
| -rw-r--r-- | package/bitlbee/patches/patch-lib_Makefile | 14 | ||||
| -rw-r--r-- | package/bitlbee/patches/patch-protocols_Makefile | 14 | ||||
| -rw-r--r-- | package/bitlbee/patches/patch-protocols_jabber_Makefile | 15 | ||||
| -rw-r--r-- | package/bitlbee/patches/patch-protocols_msn_Makefile | 15 | ||||
| -rw-r--r-- | package/bitlbee/patches/patch-protocols_oscar_Makefile | 15 | ||||
| -rw-r--r-- | package/bitlbee/patches/patch-protocols_yahoo_Makefile | 15 |
8 files changed, 30 insertions, 81 deletions
diff --git a/package/bitlbee/patches/patch-Makefile b/package/bitlbee/patches/patch-Makefile deleted file mode 100644 index 8269d1977..000000000 --- a/package/bitlbee/patches/patch-Makefile +++ /dev/null @@ -1,22 +0,0 @@ ---- bitlbee-1.2.3.orig/Makefile 2008-09-06 14:33:14.000000000 +0200 -+++ bitlbee-1.2.3/Makefile 2009-08-28 11:18:09.268088045 +0200 -@@ -111,16 +111,16 @@ $(subdirs): - - $(objects): %.o: %.c - @echo '*' Compiling $< -- @$(CC) -c $(CFLAGS) $< -o $@ -+ $(CC) -c $(CFLAGS) $< -o $@ - - $(objects): Makefile Makefile.settings config.h - - $(OUTFILE): $(objects) $(subdirs) - @echo '*' Linking $(OUTFILE) -- @$(CC) $(objects) $(subdirobjs) -o $(OUTFILE) $(LFLAGS) $(EFLAGS) -+ $(CC) -shared $(objects) $(subdirobjs) -o $(OUTFILE) $(LDFLAGS) $(EFLAGS) - ifndef DEBUG - @echo '*' Stripping $(OUTFILE) -- @-$(STRIP) $(OUTFILE) -+ -$(STRIP) $(OUTFILE) - endif - - encode: crypting.c diff --git a/package/bitlbee/patches/patch-configure b/package/bitlbee/patches/patch-configure index 9f13c535c..1f4538ac4 100644 --- a/package/bitlbee/patches/patch-configure +++ b/package/bitlbee/patches/patch-configure @@ -1,4 +1,3 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ --- bitlbee-1.2.3.orig/configure 2008-09-06 14:33:13.000000000 +0200 +++ bitlbee-1.2.3/configure 2008-10-08 16:07:32.000000000 +0200 @@ -19,7 +19,6 @@ libevent='/usr/' diff --git a/package/bitlbee/patches/patch-lib_Makefile b/package/bitlbee/patches/patch-lib_Makefile index e43ddb2a0..8fc2484cc 100644 --- a/package/bitlbee/patches/patch-lib_Makefile +++ b/package/bitlbee/patches/patch-lib_Makefile @@ -1,24 +1,20 @@ ---- bitlbee-1.2.3.orig/lib/Makefile 2008-09-06 14:33:13.000000000 +0200 -+++ bitlbee-1.2.3/lib/Makefile 2009-08-28 11:12:29.546939473 +0200 +--- bitlbee-1.2.4.orig/lib/Makefile 2009-10-17 17:26:46.000000000 +0200 ++++ bitlbee-1.2.4/lib/Makefile 2010-03-07 19:58:49.626028152 +0100 @@ -12,7 +12,7 @@ objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o CFLAGS += -Wall -LFLAGS += -r -+#LFLAGS += -r ++LFLAGS += -Wl,-r -nostdlib # [SH] Phony targets all: lib.o -@@ -32,10 +32,10 @@ distclean: clean $(subdirs) +@@ -32,7 +32,7 @@ distclean: clean $(subdirs) lib.o: $(objects) $(subdirs) @echo '*' Linking lib.o - @$(LD) $(LFLAGS) $(objects) -o lib.o -+ $(CC) -shared $(LDFLAGS) $(objects) -o lib.o ++ @$(CC) $(LFLAGS) $(objects) -o lib.o $(objects): ../Makefile.settings Makefile - $(objects): %.o: %.c - @echo '*' Compiling $< -- @$(CC) -c $(CFLAGS) $< -o $@ -+ $(CC) -c $(CFLAGS) $< -o $@ diff --git a/package/bitlbee/patches/patch-protocols_Makefile b/package/bitlbee/patches/patch-protocols_Makefile index 9e0f621f9..ffb47b391 100644 --- a/package/bitlbee/patches/patch-protocols_Makefile +++ b/package/bitlbee/patches/patch-protocols_Makefile @@ -1,24 +1,20 @@ ---- bitlbee-1.2.3.orig/protocols/Makefile 2008-09-06 14:33:13.000000000 +0200 -+++ bitlbee-1.2.3/protocols/Makefile 2009-08-28 11:13:32.079800935 +0200 +--- bitlbee-1.2.4.orig/protocols/Makefile 2009-10-17 17:26:46.000000000 +0200 ++++ bitlbee-1.2.4/protocols/Makefile 2010-03-07 20:02:06.789785295 +0100 @@ -21,7 +21,7 @@ subdirobjs = $(PROTOOBJS) # Expansion of variables subdirobjs := $(join $(subdirs),$(addprefix /,$(subdirobjs))) CFLAGS += -Wall -LFLAGS += -r -+#LFLAGS += -r ++LFLAGS += -Wl,-r -nostdlib # [SH] Phony targets all: protocols.o -@@ -44,10 +44,10 @@ $(subdirs): +@@ -44,7 +44,7 @@ $(subdirs): protocols.o: $(objects) $(subdirs) @echo '*' Linking protocols.o - @$(LD) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o -+ $(CC) -shared $(LDFLAGS) $(objects) $(subdirobjs) -o protocols.o ++ @$(CC) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o $(objects): ../Makefile.settings Makefile - $(objects): %.o: %.c - @echo '*' Compiling $< -- @$(CC) -c $(CFLAGS) $< -o $@ -+ $(CC) -c $(CFLAGS) $< -o $@ diff --git a/package/bitlbee/patches/patch-protocols_jabber_Makefile b/package/bitlbee/patches/patch-protocols_jabber_Makefile index 5bf35809d..b1dc63a0e 100644 --- a/package/bitlbee/patches/patch-protocols_jabber_Makefile +++ b/package/bitlbee/patches/patch-protocols_jabber_Makefile @@ -1,22 +1,17 @@ ---- bitlbee-1.2.3.orig/protocols/jabber/Makefile 2008-09-06 14:33:13.000000000 +0200 -+++ bitlbee-1.2.3/protocols/jabber/Makefile 2009-08-28 11:15:01.100110500 +0200 +--- bitlbee-1.2.4.orig/protocols/jabber/Makefile 2009-10-17 17:26:46.000000000 +0200 ++++ bitlbee-1.2.4/protocols/jabber/Makefile 2010-03-07 20:00:36.426039459 +0100 @@ -12,7 +12,7 @@ objects = conference.o io.o iq.o jabber.o jabber_util.o message.o presence.o sasl.o CFLAGS += -Wall -LFLAGS += -r -+#LFLAGS += -r ++LFLAGS += -Wl,-r -nostdlib # [SH] Phony targets all: jabber_mod.o -@@ -34,8 +34,8 @@ $(objects): ../../Makefile.settings Make - - $(objects): %.o: %.c - @echo '*' Compiling $< -- @$(CC) -c $(CFLAGS) $< -o $@ -+ $(CC) -c $(CFLAGS) $< -o $@ +@@ -38,4 +38,4 @@ $(objects): %.o: %.c jabber_mod.o: $(objects) @echo '*' Linking jabber_mod.o - @$(LD) $(LFLAGS) $(objects) -o jabber_mod.o -+ $(CC) -shared $(LDFLAGS) $(objects) -o jabber_mod.o ++ @$(CC) $(LFLAGS) $(objects) -o jabber_mod.o diff --git a/package/bitlbee/patches/patch-protocols_msn_Makefile b/package/bitlbee/patches/patch-protocols_msn_Makefile index df4370d39..8f634c5f6 100644 --- a/package/bitlbee/patches/patch-protocols_msn_Makefile +++ b/package/bitlbee/patches/patch-protocols_msn_Makefile @@ -1,24 +1,19 @@ ---- bitlbee-1.2.3.orig/protocols/msn/Makefile 2008-09-06 14:33:13.000000000 +0200 -+++ bitlbee-1.2.3/protocols/msn/Makefile 2009-08-28 11:13:50.455844911 +0200 +--- bitlbee-1.2.4.orig/protocols/msn/Makefile 2009-10-17 17:26:46.000000000 +0200 ++++ bitlbee-1.2.4/protocols/msn/Makefile 2010-03-07 20:00:17.406036329 +0100 @@ -12,7 +12,7 @@ objects = msn.o msn_util.o ns.o passport.o sb.o tables.o CFLAGS += -Wall -LFLAGS += -r -+#LFLAGS += -r ++LFLAGS += -Wl,-r -nostdlib # [SH] Phony targets all: msn_mod.o -@@ -34,10 +34,10 @@ $(objects): ../../Makefile.settings Make - - $(objects): %.o: %.c - @echo '*' Compiling $< -- @$(CC) -c $(CFLAGS) $< -o $@ -+ $(CC) -c $(CFLAGS) $< -o $@ +@@ -38,6 +38,6 @@ $(objects): %.o: %.c msn_mod.o: $(objects) @echo '*' Linking msn_mod.o - @$(LD) $(LFLAGS) $(objects) -o msn_mod.o -+ $(CC) -shared $(LDFLAGS) $(objects) -o msn_mod.o ++ @$(CC) $(LFLAGS) $(objects) -o msn_mod.o diff --git a/package/bitlbee/patches/patch-protocols_oscar_Makefile b/package/bitlbee/patches/patch-protocols_oscar_Makefile index 2ff710800..2d7e0dde0 100644 --- a/package/bitlbee/patches/patch-protocols_oscar_Makefile +++ b/package/bitlbee/patches/patch-protocols_oscar_Makefile @@ -1,22 +1,17 @@ ---- bitlbee-1.2.3.orig/protocols/oscar/Makefile 2008-09-06 14:33:13.000000000 +0200 -+++ bitlbee-1.2.3/protocols/oscar/Makefile 2009-08-28 11:16:04.032452435 +0200 +--- bitlbee-1.2.4.orig/protocols/oscar/Makefile 2009-10-17 17:26:46.000000000 +0200 ++++ bitlbee-1.2.4/protocols/oscar/Makefile 2010-03-07 20:00:56.836124250 +0100 @@ -12,7 +12,7 @@ objects = admin.o auth.o bos.o buddylist.o chat.o chatnav.o conn.o icq.o im.o info.o misc.o msgcookie.o rxhandlers.o rxqueue.o search.o service.o snac.o ssi.o stats.o tlv.o txqueue.o oscar_util.o oscar.o CFLAGS += -Wall -LFLAGS += -r -+#LFLAGS += -r ++LFLAGS += -Wl,-r -nostdlib # [SH] Phony targets all: oscar_mod.o -@@ -34,8 +34,8 @@ $(objects): ../../Makefile.settings Make - - $(objects): %.o: %.c - @echo '*' Compiling $< -- @$(CC) -c $(CFLAGS) $< -o $@ -+ $(CC) -c $(CFLAGS) $< -o $@ +@@ -38,4 +38,4 @@ $(objects): %.o: %.c oscar_mod.o: $(objects) @echo '*' Linking oscar_mod.o - @$(LD) $(LFLAGS) $(objects) -o oscar_mod.o -+ $(CC) -shared $(LDFLAGS) $(objects) -o oscar_mod.o ++ @$(CC) $(LFLAGS) $(objects) -o oscar_mod.o diff --git a/package/bitlbee/patches/patch-protocols_yahoo_Makefile b/package/bitlbee/patches/patch-protocols_yahoo_Makefile index 51a294aa8..4df3cc046 100644 --- a/package/bitlbee/patches/patch-protocols_yahoo_Makefile +++ b/package/bitlbee/patches/patch-protocols_yahoo_Makefile @@ -1,22 +1,17 @@ ---- bitlbee-1.2.3.orig/protocols/yahoo/Makefile 2008-09-06 14:33:13.000000000 +0200 -+++ bitlbee-1.2.3/protocols/yahoo/Makefile 2009-08-28 11:14:08.877306693 +0200 +--- bitlbee-1.2.4.orig/protocols/yahoo/Makefile 2009-10-17 17:26:46.000000000 +0200 ++++ bitlbee-1.2.4/protocols/yahoo/Makefile 2010-03-07 20:01:11.066203660 +0100 @@ -12,7 +12,7 @@ objects = yahoo.o crypt.o libyahoo2.o yahoo_fn.o yahoo_httplib.o yahoo_util.o CFLAGS += -Wall -DSTDC_HEADERS -DHAVE_STRING_H -DHAVE_STRCHR -DHAVE_MEMCPY -DHAVE_GLIB -LFLAGS += -r -+#LFLAGS += -r ++LFLAGS += -Wl,-r -nostdlib # [SH] Phony targets all: yahoo_mod.o -@@ -34,8 +34,8 @@ $(objects): ../../Makefile.settings Make - - $(objects): %.o: %.c - @echo '*' Compiling $< -- @$(CC) -c $(CFLAGS) $< -o $@ -+ $(CC) -c $(CFLAGS) $< -o $@ +@@ -38,4 +38,4 @@ $(objects): %.o: %.c yahoo_mod.o: $(objects) @echo '*' Linking yahoo_mod.o - @$(LD) $(LFLAGS) $(objects) -o yahoo_mod.o -+ $(CC) -shared $(LDFLAGS) $(objects) -o yahoo_mod.o ++ @$(CC) $(LFLAGS) $(objects) -o yahoo_mod.o |