From 6daa792eab1488d013fefc5eb7e4d01f40f38687 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 7 Feb 2010 20:03:20 +0100 Subject: change defaults for CONFIG/BUILD/INSTALL styles All packages need an update, so here is a very huge commit. Most of the 460 source packages use automatic style for configuration, building and installing. Make these styles default to "auto". If you have a package, which does not conform to this, just use manual style and add a do-$task make target. I added a new style named AUTOTOOL style, which is needed for some broken packages, which needs to be updated via autoconf or automake. I renamed CONFIGURE_STYLE to CONFIG_STYLE. Updates for some packages, which have newer upstream versions. Renaming of all package/*/extra directories. Use the directory src/ to provide overwrites of source files or to add the code, when no upstream package is available or used. src directory will be automatically used. --- package/bitlbee/patches/patch-protocols_Makefile | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 package/bitlbee/patches/patch-protocols_Makefile (limited to 'package/bitlbee/patches/patch-protocols_Makefile') diff --git a/package/bitlbee/patches/patch-protocols_Makefile b/package/bitlbee/patches/patch-protocols_Makefile deleted file mode 100644 index 9e0f621f9..000000000 --- a/package/bitlbee/patches/patch-protocols_Makefile +++ /dev/null @@ -1,24 +0,0 @@ ---- 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 -@@ -21,7 +21,7 @@ subdirobjs = $(PROTOOBJS) - # Expansion of variables - subdirobjs := $(join $(subdirs),$(addprefix /,$(subdirobjs))) - CFLAGS += -Wall --LFLAGS += -r -+#LFLAGS += -r - - # [SH] Phony targets - all: protocols.o -@@ -44,10 +44,10 @@ $(subdirs): - - protocols.o: $(objects) $(subdirs) - @echo '*' Linking protocols.o -- @$(LD) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o -+ $(CC) -shared $(LDFLAGS) $(objects) $(subdirobjs) -o protocols.o - - $(objects): ../Makefile.settings Makefile - - $(objects): %.o: %.c - @echo '*' Compiling $< -- @$(CC) -c $(CFLAGS) $< -o $@ -+ $(CC) -c $(CFLAGS) $< -o $@ -- cgit v1.2.3 From 1390c5863daa190d47dbfae41377f5c0656f2c0e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 12 Mar 2010 17:28:03 +0100 Subject: fix cross-compile the right way --- package/bitlbee/patches/patch-lib_Makefile | 20 ++++++++++++++++++++ package/bitlbee/patches/patch-protocols_Makefile | 20 ++++++++++++++++++++ .../bitlbee/patches/patch-protocols_jabber_Makefile | 17 +++++++++++++++++ package/bitlbee/patches/patch-protocols_msn_Makefile | 19 +++++++++++++++++++ .../bitlbee/patches/patch-protocols_oscar_Makefile | 17 +++++++++++++++++ .../bitlbee/patches/patch-protocols_yahoo_Makefile | 17 +++++++++++++++++ 6 files changed, 110 insertions(+) create mode 100644 package/bitlbee/patches/patch-lib_Makefile create mode 100644 package/bitlbee/patches/patch-protocols_Makefile create mode 100644 package/bitlbee/patches/patch-protocols_jabber_Makefile create mode 100644 package/bitlbee/patches/patch-protocols_msn_Makefile create mode 100644 package/bitlbee/patches/patch-protocols_oscar_Makefile create mode 100644 package/bitlbee/patches/patch-protocols_yahoo_Makefile (limited to 'package/bitlbee/patches/patch-protocols_Makefile') diff --git a/package/bitlbee/patches/patch-lib_Makefile b/package/bitlbee/patches/patch-lib_Makefile new file mode 100644 index 000000000..8fc2484cc --- /dev/null +++ b/package/bitlbee/patches/patch-lib_Makefile @@ -0,0 +1,20 @@ +--- 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 += -Wl,-r -nostdlib + + # [SH] Phony targets + all: lib.o +@@ -32,7 +32,7 @@ distclean: clean $(subdirs) + + lib.o: $(objects) $(subdirs) + @echo '*' Linking lib.o +- @$(LD) $(LFLAGS) $(objects) -o lib.o ++ @$(CC) $(LFLAGS) $(objects) -o lib.o + + $(objects): ../Makefile.settings Makefile + diff --git a/package/bitlbee/patches/patch-protocols_Makefile b/package/bitlbee/patches/patch-protocols_Makefile new file mode 100644 index 000000000..ffb47b391 --- /dev/null +++ b/package/bitlbee/patches/patch-protocols_Makefile @@ -0,0 +1,20 @@ +--- 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 += -Wl,-r -nostdlib + + # [SH] Phony targets + all: protocols.o +@@ -44,7 +44,7 @@ $(subdirs): + + protocols.o: $(objects) $(subdirs) + @echo '*' Linking protocols.o +- @$(LD) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o ++ @$(CC) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o + + $(objects): ../Makefile.settings Makefile + diff --git a/package/bitlbee/patches/patch-protocols_jabber_Makefile b/package/bitlbee/patches/patch-protocols_jabber_Makefile new file mode 100644 index 000000000..b1dc63a0e --- /dev/null +++ b/package/bitlbee/patches/patch-protocols_jabber_Makefile @@ -0,0 +1,17 @@ +--- 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 += -Wl,-r -nostdlib + + # [SH] Phony targets + all: jabber_mod.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) $(LFLAGS) $(objects) -o jabber_mod.o diff --git a/package/bitlbee/patches/patch-protocols_msn_Makefile b/package/bitlbee/patches/patch-protocols_msn_Makefile new file mode 100644 index 000000000..8f634c5f6 --- /dev/null +++ b/package/bitlbee/patches/patch-protocols_msn_Makefile @@ -0,0 +1,19 @@ +--- 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 += -Wl,-r -nostdlib + + # [SH] Phony targets + all: msn_mod.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) $(LFLAGS) $(objects) -o msn_mod.o + + diff --git a/package/bitlbee/patches/patch-protocols_oscar_Makefile b/package/bitlbee/patches/patch-protocols_oscar_Makefile new file mode 100644 index 000000000..2d7e0dde0 --- /dev/null +++ b/package/bitlbee/patches/patch-protocols_oscar_Makefile @@ -0,0 +1,17 @@ +--- 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 += -Wl,-r -nostdlib + + # [SH] Phony targets + all: oscar_mod.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) $(LFLAGS) $(objects) -o oscar_mod.o diff --git a/package/bitlbee/patches/patch-protocols_yahoo_Makefile b/package/bitlbee/patches/patch-protocols_yahoo_Makefile new file mode 100644 index 000000000..4df3cc046 --- /dev/null +++ b/package/bitlbee/patches/patch-protocols_yahoo_Makefile @@ -0,0 +1,17 @@ +--- 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 += -Wl,-r -nostdlib + + # [SH] Phony targets + all: yahoo_mod.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) $(LFLAGS) $(objects) -o yahoo_mod.o -- cgit v1.2.3